diff options
| author | guanghuafan <gfan@google.com> | 2018-01-03 11:13:15 -0800 |
|---|---|---|
| committer | cnorthrop <cnorthrop@google.com> | 2018-01-04 10:52:11 -0700 |
| commit | 19dedae9512694e239c7f1c577353c175511a876 (patch) | |
| tree | 851a662881d5ee476d97a86734cfdc691674c50b /build-android/cmake/layerlib | |
| parent | a43f2588a8910e78d8fc3a325147b0fd75f42b2e (diff) | |
| download | usermoji-19dedae9512694e239c7f1c577353c175511a876.tar.xz | |
Update android-build/cmake scripts to build with Android Studio 3.0.0+
Diffstat (limited to 'build-android/cmake/layerlib')
| -rw-r--r-- | build-android/cmake/layerlib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | build-android/cmake/layerlib/build.gradle | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/build-android/cmake/layerlib/CMakeLists.txt b/build-android/cmake/layerlib/CMakeLists.txt index cb586cd2..3981e319 100644 --- a/build-android/cmake/layerlib/CMakeLists.txt +++ b/build-android/cmake/layerlib/CMakeLists.txt @@ -32,9 +32,9 @@ 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/third_party") + set(EXTERNAL_DIR "${SRC_DIR}/build-android/third_party/shaderc/third_party") set(SPIRV_LIB - "${EXTERNAL_DIR}/shaderc/android_test/obj/local/${ANDROID_ABI}/libSPIRV-Tools.a") + "${SRC_DIR}/build-android/third_party/shaderc/android_test/obj/local/${ANDROID_ABI}/libSPIRV-Tools.a") endif() set(COMMON_DIR "${SRC_DIR}/build-android/generated") @@ -90,6 +90,7 @@ target_link_libraries(VkLayer_parameter_validation PRIVATE log layer_utils) add_library(VkLayer_object_tracker SHARED ${COMMON_DIR}/include/object_tracker.cpp + ${SRC_DIR}/layers/object_tracker_utils.cpp ${SRC_DIR}/layers/vk_layer_table.cpp) target_include_directories(VkLayer_object_tracker PRIVATE ${SRC_DIR}/include diff --git a/build-android/cmake/layerlib/build.gradle b/build-android/cmake/layerlib/build.gradle index efa84721..889d2326 100644 --- a/build-android/cmake/layerlib/build.gradle +++ b/build-android/cmake/layerlib/build.gradle @@ -2,16 +2,9 @@ apply plugin: 'com.android.library' android { /* - * we are interested in only the debug version of layers, so ONLY publish debug version - * library, which will enforce building ONLY debug version, and packing only the debug - * version of layers. The document is at: - * https://developer.android.com/studio/build/build-variants.html - * http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Library-Publication + * Required: Android Studio 3.0.0+! */ - publishNonDefault true - compileSdkVersion 25 - buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 24 @@ -21,7 +14,7 @@ android { ndk.abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' externalNativeBuild { cmake.arguments '-DANDROID_TOOLCHAIN=clang', - '-DANDROID_STL=gnustl_static', + '-DANDROID_STL=c++_static', '-DANDROID_PLATFORM=android-24' } } |