From 06b5e5bf05696b1bcdb859277b17d552f0e61ef6 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Mon, 1 Feb 2016 10:01:45 -0700 Subject: layers: MR217 Turn on more layers for Android build --- buildAndroid/android-generate.sh | 1 + buildAndroid/jni/Android.mk | 25 +++++++++++++++++++++++++ buildAndroid/jni/Application.mk | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) (limited to 'buildAndroid') diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index 69d53f6d..725ef1ac 100755 --- 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 16a412b6..bccb6458 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -116,6 +116,31 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := VkLayer_unique_objects +LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/unique_objects.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/layers \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader +LOCAL_STATIC_LIBRARIES += layer_utils +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_LDLIBS := -llog +include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := VkLayer_swapchain +LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader +LOCAL_STATIC_LIBRARIES += layer_utils +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR +LOCAL_LDLIBS := -llog +include $(BUILD_SHARED_LIBRARY) + include $(CLEAR_VARS) LOCAL_MODULE := VkLayerValidationTests LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 76af9d18..cd749e37 100644 --- 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 APP_PLATFORM := android-22 APP_STL := gnustl_static -APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayerValidationTests +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 APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES NDK_TOOLCHAIN_VERSION := 4.8 -- cgit v1.2.3