diff options
| author | Jesse Hall <jhall1024@gmail.com> | 2015-12-22 21:27:55 -0800 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-12-23 03:49:55 -0700 |
| commit | 1e70e2513eb98ca2496c2d55de7adbb84eee9164 (patch) | |
| tree | 23e85923fdcdf13487705753e834bd49b2cb32bf | |
| parent | 93040bbb39953f48deb2744018ff946238fbb58a (diff) | |
| download | usermoji-1e70e2513eb98ca2496c2d55de7adbb84eee9164.tar.xz | |
Fix Android layers build
Conflicts:
include/vulkan/vk_lunarg_debug_report.h
| -rw-r--r-- | buildAndroid/jni/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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
|