commit 99341848129a0a17e024a7395aac6fa8eec9b578
author Courtney Goeltzenleuchter <courtneygo@google.com> Thu May 26 19:59:10 2016 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Thu May 26 20:17:35 2016 -0600
tree 3e7ab000f1d93fbe80d52d63d7780e90ae227774
parent 9ef45ac8e471078a10eed2445c693cdf2a6130cd

Fix incorrect paths for shaderc build

Change-Id: Id63df018a8c12bed3e2d2002226a7bfc04f40e9f

build-android/build.py

diff --git a/build-android/build.py b/build-android/build.py
index cb34512..bf06622 100755
--- a/build-android/build.py
+++ b/build-android/build.py
@@ -146,11 +146,11 @@
     # typical ndk-build layout with a jni/{Android,Application}.mk.
     'NDK_PROJECT_PATH=null',
     'NDK_TOOLCHAIN_VERSION=' + compiler,
-    'APP_BUILD_SCRIPT=' + os.path.join(build_dir, 'jni', 'Android.mk'),
+    'APP_BUILD_SCRIPT=' + os.path.join(shaderc_dir, 'jni', 'Android.mk'),
     'APP_STL=' + stl,
-    'NDK_APPLICATION_MK=' + os.path.join(build_dir, 'jni', 'Application.mk'),
-    'NDK_OUT=' + obj_out,
-    'NDK_LIBS_OUT=' + lib_out,
+    'NDK_APPLICATION_MK=' + os.path.join(shaderc_dir, 'jni', 'Application.mk'),
+    'NDK_OUT=' + os.path.join(shaderc_dir, 'obj'),
+    'NDK_LIBS_OUT=' + os.path.join(shaderc_dir, 'jniLibs'),
     'THIRD_PARTY_PATH=../..',
 
     # Put armeabi-v7a-hard in its own directory.