From d0d65fa2d6e1256d011982fe121ad0417e9014ca Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 28 Nov 2013 15:07:03 +0100
Subject: Put thirdparty config headers in separate directories.

Only -I the config header directory if building the thirdparty library,
not if using the system library.

Fix bug 694808.
---
 platform/android/jni/Core.mk       | 4 +++-
 platform/android/jni/ThirdParty.mk | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'platform/android')

diff --git a/platform/android/jni/Core.mk b/platform/android/jni/Core.mk
index 26d5a629..336d82d9 100644
--- a/platform/android/jni/Core.mk
+++ b/platform/android/jni/Core.mk
@@ -31,7 +31,9 @@ LOCAL_C_INCLUDES := \
 	../../source/xps \
 	../../source/cbz \
 	../../source/img \
-	../../scripts \
+	../../scripts/freetype \
+	../../scripts/jpeg \
+	../../scripts/openjpeg \
 	../../generated \
 	../../resources \
 	../../include \
diff --git a/platform/android/jni/ThirdParty.mk b/platform/android/jni/ThirdParty.mk
index 0092a438..72745494 100644
--- a/platform/android/jni/ThirdParty.mk
+++ b/platform/android/jni/ThirdParty.mk
@@ -10,7 +10,9 @@ LOCAL_C_INCLUDES := \
 	../../thirdparty/jpeg \
 	../../thirdparty/zlib \
 	../../thirdparty/freetype/include \
-	../../scripts
+	../../scripts/freetype \
+	../../scripts/jpeg \
+	../../scripts/openjpeg \
 
 LOCAL_CFLAGS := \
 	-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON -DHAVE_STDINT_H \
-- 
cgit v1.2.3