Merge "Use -Werror in external/vulkan-validation-layers"
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index f9d47ba..11b4759 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -164,8 +164,9 @@
LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson.cc \
$(SRC_DIR)/libs/vkjson/vkjson_instance.cc \
$(SRC_DIR)/common/vulkan_wrapper.cpp \
- $(SRC_DIR)/loader/cJSON.c
+ $(SRC_DIR)/libs/cjson/cJSON.c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
+ $(LOCAL_PATH)/$(SRC_DIR)/libs/cjson/includes \
$(LOCAL_PATH)/$(SRC_DIR)/loader
LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot
diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt
index 2e79d91..80357b2 100644
--- a/libs/vkjson/CMakeLists.txt
+++ b/libs/vkjson/CMakeLists.txt
@@ -23,9 +23,10 @@
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../loader
${CMAKE_CURRENT_SOURCE_DIR}/../../include/vulkan
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/cjson/includes
)
-add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../loader/cJSON.c)
+add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../libs/cjson/cJSON.c)
if(UNIX)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
