From 0dc620ef57978644037c6c593a71f6cb6c43757e Mon Sep 17 00:00:00 2001 From: Mike Stroyan Date: Fri, 6 Oct 2017 11:05:21 -0600 Subject: android: Use NDK structure for third party modules Locate glslang and spirv directories under shaderc directory. This allows the layers build to optionally use the NDK sources. For glslang and spirv and shaderc- Use LOCAL_STATIC_LIBRARIES instead of LOCAL_C_INCLUDES to find headers. Use import-module instead of PREBUILT_STATIC_LIBRARY. --- build-android/cmake/layerlib/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-android/cmake/layerlib') diff --git a/build-android/cmake/layerlib/CMakeLists.txt b/build-android/cmake/layerlib/CMakeLists.txt index 7dbf52dc..d7653b90 100644 --- a/build-android/cmake/layerlib/CMakeLists.txt +++ b/build-android/cmake/layerlib/CMakeLists.txt @@ -32,7 +32,7 @@ else () # ${SRC_DIR} # ${SRC_DIR}/build-android/external (for glslang, spirv-tools & shaderc ) get_filename_component(SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../.." ABSOLUTE) - set(EXTERNAL_DIR "${SRC_DIR}/build-android/external") + set(EXTERNAL_DIR "${SRC_DIR}/build-android/third_party") set(SPIRV_LIB "${EXTERNAL_DIR}/shaderc/android_test/obj/local/${ANDROID_ABI}/libSPIRV-Tools.a") endif() -- cgit v1.2.3