build: use main Android.mk

KhronosGroup · Aug 16, 2023 · c72781b · c72781b
1 parent b7f2f9f
commit c72781b
Showing 1 changed file with 3 additions and 25 deletions.
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
@@ -19,22 +19,6 @@ LAYER_DIR := ../generated
 THIRD_PARTY := ../third_party
 
 VULKAN_INCLUDE := $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Headers/include
-VULKAN_UTIL_INCLUDE := $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Utility-Libraries/include
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := VulkanLayerSettings
-
-LOCAL_SRC_FILES += $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Utility-Libraries/src/layer/layer_settings_manager.cpp
-LOCAL_SRC_FILES += $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Utility-Libraries/src/layer/layer_settings_util.cpp
-LOCAL_SRC_FILES += $(LOCAL_PATH)/$(THIRD_PARTY)/Vulkan-Utility-Libraries/src/layer/vk_layer_settings.cpp
-
-LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \
-                    $(VULKAN_UTIL_INCLUDE)
-LOCAL_CPPFLAGS += -std=c++17 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -fexceptions
-LOCAL_CPPFLAGS += -DVK_ENABLE_BETA_EXTENSIONS -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden
-LOCAL_CPPFLAGS += -isystem $(VULKAN_INCLUDE)
-LOCAL_CPPFLAGS += -isystem $(VULKAN_UTIL_INCLUDE)
-include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := extlayer_utils
@@ -56,12 +40,10 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := VkLayer_khronos_synchronization2
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/synchronization2.cpp
 LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \
-                    $(VULKAN_UTIL_INCLUDE) \
                     $(LOCAL_PATH)/$(SRC_DIR)/utils \
                     $(LOCAL_PATH)/$(SRC_DIR)/utils/generated \
                     $(LOCAL_PATH)/$(THIRD_PARTY)/shaderc/third_party/spirv-tools/external/spirv-headers/include
-
-LOCAL_STATIC_LIBRARIES += extlayer_utils glslang SPIRV-Tools SPIRV-Tools-opt VulkanLayerSettings
+LOCAL_STATIC_LIBRARIES += extlayer_utils glslang SPIRV-Tools SPIRV-Tools-opt
 LOCAL_CPPFLAGS += -std=c++17 -fexceptions
 LOCAL_CPPFLAGS += -DVK_ENABLE_BETA_EXTENSIONS -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden
 LOCAL_LDLIBS    := -llog -landroid
@@ -73,13 +55,11 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := VkLayer_khronos_memory_decompression
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/decompression/decompression.cpp
 LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \
-                    $(VULKAN_UTIL_INCLUDE) \
                     $(LOCAL_PATH)/$(SRC_DIR)/layers \
                     $(LOCAL_PATH)/$(SRC_DIR)/utils \
                     $(LOCAL_PATH)/$(SRC_DIR)/utils/generated \
                     $(LOCAL_PATH)/$(THIRD_PARTY)/shaderc/third_party/spirv-tools/external/spirv-headers/include
-
-LOCAL_STATIC_LIBRARIES += extlayer_utils glslang SPIRV-Tools SPIRV-Tools-opt VulkanLayerSettings
+LOCAL_STATIC_LIBRARIES += extlayer_utils glslang SPIRV-Tools SPIRV-Tools-opt
 LOCAL_CPPFLAGS += -std=c++17 -fexceptions
 LOCAL_CPPFLAGS += -DVK_ENABLE_BETA_EXTENSIONS -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden
 LOCAL_LDLIBS    := -llog -landroid
@@ -91,9 +71,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := VkLayer_khronos_timeline_semaphore
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/timeline_semaphore.c \
                    $(SRC_DIR)/layers/hash_table.cpp
-
-LOCAL_C_INCLUDES += $(VULKAN_INCLUDE) \
-                    $(VULKAN_UTIL_INCLUDE)
+LOCAL_C_INCLUDES += $(VULKAN_INCLUDE)
 LOCAL_CPPFLAGS += -std=c++17 -fexceptions
 LOCAL_CPPFLAGS += -DVK_ENABLE_BETA_EXTENSIONS -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden
 LOCAL_LDLIBS    := -llog -landroid