commit 4fb40e67fc4f54cef3676f3b9998b83bc374f1a2
author Jesse Hall <jhall1024@gmail.com> Tue Dec 22 21:27:55 2015 -0800
committer Jon Ashburn <jon@lunarg.com> Wed Dec 23 03:49:55 2015 -0700
tree 160fdbd3b0ab6b9742852562f39f63bf0a040710
parent 36eeb747d1df5ac523dcef8241e89e8be7bd7a5c

Fix Android layers build

Conflicts:
	include/vulkan/vk_lunarg_debug_report.h

buildAndroid/jni/Android.mk

diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
index 7a78824..167509d 100644
--- a/buildAndroid/jni/Android.mk
+++ b/buildAndroid/jni/Android.mk
@@ -23,7 +23,6 @@
 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_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

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index c41893d..460f6f6 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -99,7 +99,7 @@
         "   uFragColor = vec4(0,1,0,1);\n"
         "}\n";
 
-static VkBool32 myDbgFunc(
+static VKAPI_ATTR VkBool32 VKAPI_CALL myDbgFunc(
     VkFlags                             msgFlags,
     VkDebugReportObjectTypeEXT                     objType,
     uint64_t                            srcObject,