Fix Android layers build

Conflicts:
	include/vulkan/vk_lunarg_debug_report.h

diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 7a78824..167509d 100644 (file)
--- a/buildAndroid/jni/Android.mk
+++ b/buildAndroid/jni/Android.mk
@@ -23,7 +23,6 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include\r
 LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR\r
-LOCAL_LDLIBS    := -llog\r
 include $(BUILD_STATIC_LIBRARY)\r
 \r
 include $(CLEAR_VARS)\r
@@ -44,7 +43,8 @@ LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp
 LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp\r
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \\r
                     $(SRC_DIR)/buildAndroid/generated \\r
-                    $(SRC_DIR)/loader\r
+                    $(SRC_DIR)/loader \\r
+                    $(SRC_DIR)/../glslang/SPIRV\r
 LOCAL_STATIC_LIBRARIES += layer_utils\r
 LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR\r
 LOCAL_LDLIBS    := -llog\r