diff options
author | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-09-23 12:52:08 -0600 |
---|---|---|
committer | Courtney Goeltzenleuchter <courtneygo@google.com> | 2016-09-23 13:34:53 -0600 |
commit | cbc75f522adb1f0cc3d86caae467faccce840b04 (patch) | |
tree | caac1632f5cd23b5e0b6295efa59f4737e76f2d5 | |
parent | 970e847d910b12591e94d00c71d5f3a487341f56 (diff) | |
download | vulkan-validation-layers-ndk-r13-release.tar.gz |
Don't use an abspath LOCAL_PATH.ndk-r13ndk-r13-release
This doesn't work on Windows.
Test: ./run_tests.py --filter test-vulkan-layers # on windows
Test: cd ../out/build-android; ./android-generate.sh; ndk-build
Bug: http://b/31687097
Change-Id: I19256ed7d828422f00210e1d9aebf3ea9af04c14
(cherry picked from commit 9df80eb42c9e831a1e0b3be4f5346c2ff13b278c)
-rw-r--r-- | build-android/jni/Android.mk | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 7d9168dbe..610cdf96b 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_PATH := $(abspath $(call my-dir)) -SRC_DIR := $(LOCAL_PATH)/../.. -LAYER_DIR := $(LOCAL_PATH)/../generated +LOCAL_PATH := $(call my-dir) +SRC_DIR := ../.. +LAYER_DIR := ../generated # specific for NDK build SHADERC_DIR := $(SRC_DIR)/../shaderc @@ -27,9 +27,9 @@ LOCAL_MODULE := layer_utils LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES include $(BUILD_STATIC_LIBRARY) @@ -40,10 +40,10 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/descriptor_sets.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_SRC_FILES += $(LAYER_DIR)/include/vk_safe_struct.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils glslang SPIRV-Tools LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -54,10 +54,10 @@ include $(CLEAR_VARS) 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)/layers \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -68,10 +68,10 @@ include $(CLEAR_VARS) 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 \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/layers \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -82,10 +82,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_object_tracker LOCAL_SRC_FILES += $(SRC_DIR)/layers/object_tracker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -96,10 +96,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_threading 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 \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -111,10 +111,10 @@ LOCAL_MODULE := VkLayer_unique_objects LOCAL_SRC_FILES += $(LAYER_DIR)/include/unique_objects.cpp LOCAL_SRC_FILES += $(LAYER_DIR)/include/vk_safe_struct.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES @@ -125,10 +125,10 @@ 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)/layers \ - $(LAYER_DIR)/include \ - $(SRC_DIR)/loader +LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/layers \ + $(LOCAL_PATH)/$(LAYER_DIR)/include \ + $(LOCAL_PATH)/$(SRC_DIR)/loader LOCAL_STATIC_LIBRARIES += layer_utils LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES |