layers: MR217 Turn on more layers for Android build

diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh
index 69d53f6..725ef1a 100755 (executable)
--- a/buildAndroid/android-generate.sh
+++ b/buildAndroid/android-generate.sh
@@ -23,5 +23,6 @@ python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs
 python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated
 
 python ../vk-layer-generate.py object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp
+python ../vk-layer-generate.py unique_objects ../include/vulkan/vulkan.h > generated/unique_objects.cpp
 ( cd generated; python ../../genvk.py threading -registry ../../vk.xml thread_check.h )
 

diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 16a412b..bccb645 100644 (file)
--- a/buildAndroid/jni/Android.mk
+++ b/buildAndroid/jni/Android.mk
@@ -117,6 +117,31 @@ LOCAL_LDLIBS    := -llog
 include $(BUILD_SHARED_LIBRARY)\r
 \r
 include $(CLEAR_VARS)\r
+LOCAL_MODULE := VkLayer_unique_objects\r
+LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/unique_objects.cpp\r
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
+LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
+                    $(SRC_DIR)/layers \\r
+                   $(SRC_DIR)/buildAndroid/generated \\r
+                   $(SRC_DIR)/loader\r
+LOCAL_STATIC_LIBRARIES += layer_utils\r
+LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR\r
+LOCAL_LDLIBS    := -llog\r
+include $(BUILD_SHARED_LIBRARY)\r
+\r
+include $(CLEAR_VARS)\r
+LOCAL_MODULE := VkLayer_swapchain\r
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.cpp\r
+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
+LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
+                   $(SRC_DIR)/buildAndroid/generated \\r
+                   $(SRC_DIR)/loader\r
+LOCAL_STATIC_LIBRARIES += layer_utils\r
+LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR\r
+LOCAL_LDLIBS    := -llog\r
+include $(BUILD_SHARED_LIBRARY)\r
+\r
+include $(CLEAR_VARS)\r
 LOCAL_MODULE := VkLayerValidationTests\r
 LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \\r
                    $(SRC_DIR)/tests/vktestbinding.cpp \\r

diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk
index 76af9d1..cd749e3 100644 (file)
--- a/buildAndroid/jni/Application.mk
+++ b/buildAndroid/jni/Application.mk
@@ -16,6 +16,6 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64\r
 APP_PLATFORM := android-22\r
 APP_STL := gnustl_static\r
-APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayerValidationTests\r
+APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects VkLayerValidationTests\r
 APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES\r
 NDK_TOOLCHAIN_VERSION := 4.8\r