From 1e70e2513eb98ca2496c2d55de7adbb84eee9164 Mon Sep 17 00:00:00 2001
From: Jesse Hall <jhall1024@gmail.com>
Date: Tue, 22 Dec 2015 21:27:55 -0800
Subject: Fix Android layers build

Conflicts:
	include/vulkan/vk_lunarg_debug_report.h
---
 buildAndroid/jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'buildAndroid')

diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 7a788248..167509d2 100644
--- 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
 LOCAL_C_INCLUDES += $(SRC_DIR)/include
 LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
-LOCAL_LDLIBS    := -llog
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -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
 LOCAL_C_INCLUDES += $(SRC_DIR)/include \
                     $(SRC_DIR)/buildAndroid/generated \
-                    $(SRC_DIR)/loader
+                    $(SRC_DIR)/loader \
+                    $(SRC_DIR)/../glslang/SPIRV
 LOCAL_STATIC_LIBRARIES += layer_utils
 LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR
 LOCAL_LDLIBS    := -llog
-- 
cgit v1.2.3