diff options
| author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-03-22 10:58:40 -0600 |
|---|---|---|
| committer | Ian Elliott <ianelliott@google.com> | 2016-03-24 08:57:18 -0600 |
| commit | 591805d5506290db523d60f5e68e08b15e894fb6 (patch) | |
| tree | d515a606b44344ef59e4c6d02bffbbfaa028e8ef /buildAndroid | |
| parent | 1a07eb955cb15b69dd709f5743064c1842ac74fd (diff) | |
| download | usermoji-591805d5506290db523d60f5e68e08b15e894fb6.tar.xz | |
GH171: Use relative path for building Android bits
Diffstat (limited to 'buildAndroid')
| -rw-r--r-- | buildAndroid/jni/Android.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index deb00f1b..e9dfc36e 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -32,7 +32,7 @@ LOCAL_MODULE := VkLayer_core_validation LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader \ $(SRC_DIR)/../glslang LOCAL_STATIC_LIBRARIES += layer_utils @@ -45,7 +45,7 @@ LOCAL_MODULE := VkLayer_device_limits LOCAL_SRC_FILES += $(SRC_DIR)/layers/device_limits.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR @@ -57,7 +57,7 @@ LOCAL_MODULE := VkLayer_image LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR @@ -69,7 +69,7 @@ LOCAL_MODULE := VkLayer_parameter_validation LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/layers \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils @@ -79,11 +79,11 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_object_tracker -LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_tracker.cpp +LOCAL_SRC_FILES += $(MY_PATH)/../generated/object_tracker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR @@ -96,7 +96,7 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR @@ -105,12 +105,12 @@ 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)/buildAndroid/generated/vk_safe_struct.cpp +LOCAL_SRC_FILES += $(MY_PATH)/../generated/unique_objects.cpp +LOCAL_SRC_FILES += $(MY_PATH)/../generated/vk_safe_struct.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ - $(SRC_DIR)/buildAndroid/generated \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR @@ -122,7 +122,7 @@ 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 \ + $(MY_PATH)/../generated \ $(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR |