From a4962240bdf7ddc221c477ada1c2a99c1aee3e2e Mon Sep 17 00:00:00 2001
From: Rogier-5 <rogier777@gmail.com>
Date: Fri, 19 Aug 2016 20:23:30 +0200
Subject: [PATCH] Fix for failure to find jsoncpp in android build (#4456)

Commit 4503b5 did not update the android build script.
---
 build/android/jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index a42ab76b8..2d850385e 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -99,7 +99,7 @@ LOCAL_C_INCLUDES := \
 		jni/src                                   \
 		jni/src/script                            \
 		jni/src/lua/src                           \
-		jni/src/json                              \
+		jni/src/jsoncpp                           \
 		jni/src/cguittfont                        \
 		deps/irrlicht/include                     \
 		deps/libiconv/include                     \
@@ -361,7 +361,7 @@ LOCAL_SRC_FILES += \
 		jni/src/threading/thread.cpp
 
 # JSONCPP
-LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/src/jsoncpp/json/jsoncpp.cpp
 
 LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
 LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)
-- 
GitLab