build: Modify Android build for new repo layout
Changed location of main include dir, disabled vkjson build,
removed unneeded references.
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index 5540edc..12e5332 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -29,8 +29,6 @@
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h )
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.cpp )
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.c )
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_dispatch_table.h )
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h )
( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp )
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 2915de1..07cf1be 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -23,10 +23,9 @@
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_format_utils.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(LOCAL_PATH)/$(SRC_DIR)/layers
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
include $(BUILD_STATIC_LIBRARY)
@@ -39,10 +38,9 @@
LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_validation.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/xxhash.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(LOCAL_PATH)/$(LAYER_DIR)/include
LOCAL_STATIC_LIBRARIES += layer_utils glslang SPIRV-Tools
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
@@ -56,10 +54,9 @@
LOCAL_SRC_FILES += $(LAYER_DIR)/include/parameter_validation.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation_utils.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(LOCAL_PATH)/$(SRC_DIR)/layers
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
@@ -73,10 +70,9 @@
LOCAL_SRC_FILES += $(LAYER_DIR)/include/object_tracker.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/object_tracker_utils.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(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
@@ -89,10 +85,9 @@
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 += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(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
@@ -105,10 +100,9 @@
LOCAL_MODULE := VkLayer_unique_objects
LOCAL_SRC_FILES += $(SRC_DIR)/layers/unique_objects.cpp
LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
- $(LOCAL_PATH)/$(LAYER_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
+ $(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
@@ -124,7 +118,7 @@
$(SRC_DIR)/tests/vktestframeworkandroid.cpp \
$(SRC_DIR)/tests/vkrenderframework.cpp \
$(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(LAYER_DIR)/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
$(LOCAL_PATH)/$(SRC_DIR)/libs \
@@ -146,7 +140,7 @@
$(SRC_DIR)/tests/vktestframeworkandroid.cpp \
$(SRC_DIR)/tests/vkrenderframework.cpp \
$(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include \
$(LOCAL_PATH)/$(LAYER_DIR)/include \
$(LOCAL_PATH)/$(SRC_DIR)/layers \
$(LOCAL_PATH)/$(SRC_DIR)/libs \
@@ -160,32 +154,29 @@
LOCAL_LDFLAGS := -u ANativeActivity_onCreate
include $(BUILD_SHARED_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE := vkjson
-LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson.cc \
- $(SRC_DIR)/libs/vkjson/vkjson_instance.cc \
- $(SRC_DIR)/common/vulkan_wrapper.cpp \
- $(SRC_DIR)/loader/cJSON.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
- $(LOCAL_PATH)/$(SRC_DIR)/loader
-
-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 --include=$(SRC_DIR)/common/vulkan_wrapper.h
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vkjson_info
-LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson_info.cc \
- $(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/loader \
- $(LOCAL_PATH)/$(SRC_DIR)/include
-
-LOCAL_STATIC_LIBRARIES += vkjson
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -Wno-sign-compare -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_LDLIBS := -llog
-LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
-include $(BUILD_EXECUTABLE)
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := vkjson
+#LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson.cc \
+# $(SRC_DIR)/libs/vkjson/vkjson_instance.cc \
+# $(SRC_DIR)/common/vulkan_wrapper.cpp
+#LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include
+#
+#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 --include=$(SRC_DIR)/common/vulkan_wrapper.h
+#include $(BUILD_STATIC_LIBRARY)
+#
+#include $(CLEAR_VARS)
+#LOCAL_MODULE := vkjson_info
+#LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson_info.cc \
+# $(SRC_DIR)/common/vulkan_wrapper.cpp \
+# $(LOCAL_PATH)/$(SRC_DIR)/Vulkan-Headers/include
+#
+#LOCAL_STATIC_LIBRARIES += vkjson
+#LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
+#LOCAL_CPPFLAGS += -Wno-sign-compare -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
+#LOCAL_LDLIBS := -llog
+#LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
+#include $(BUILD_EXECUTABLE)
$(call import-module,android/native_app_glue)
$(call import-module,third_party/googletest)