diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2018-11-12 15:48:40 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2018-12-04 13:22:33 -0500 |
| commit | 60338829ee06ea3234790511b6489fa412c29aab (patch) | |
| tree | db1b7dde473e978e6e395ef5906777498fb08074 /build-android/jni/Android.mk | |
| parent | a5b163f2c3b6cd4a181b42ccad5dddd388c5b581 (diff) | |
| download | vulkan-validation-layers-60338829ee06ea3234790511b6489fa412c29aab.tar.gz | |
layers: Add cmake compile defs to add layer macro
Modified cmake add-layer macro to pass in a list of compile-time
definitions. This allows control of uber-layer options and allows
multiple co-existing uber-layer build configurations.
Change-Id: I32921d8f20b068849c5ec2f6b9e2690fe1803ec2
Diffstat (limited to 'build-android/jni/Android.mk')
| -rw-r--r-- | build-android/jni/Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index f67bddd34..3036a4bd7 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -78,7 +78,7 @@ LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \ $(LOCAL_PATH)/$(LAYER_DIR)/include LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden -DBUILD_OBJECT_TRACKER LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL @@ -100,13 +100,14 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_unique_objects -LOCAL_SRC_FILES += $(SRC_DIR)/layers/unique_objects.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/layer_chassis_dispatch.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/include/chassis.cpp LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \ $(LOCAL_PATH)/$(SRC_DIR)/layers \ $(LOCAL_PATH)/$(LAYER_DIR)/include LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden +LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden -DLAYER_CHASSIS_CAN_WRAP_HANDLES LOCAL_LDLIBS := -llog LOCAL_LDFLAGS += -Wl,-Bsymbolic LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL |