summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLeith Bade <leith@leithalweapon.geek.nz>2014-11-05 22:53:48 +1100
committerLeith Bade <leith@leithalweapon.geek.nz>2014-11-05 22:53:48 +1100
commit9476b7a66f4864a1a10b083f6afe3bececd6fa84 (patch)
treef7229765f1da4112d2c8800c27aa1dd6ce23ea58 /Makefile
parentfcab29cab0abe0142770d817c64c0f711e7f7ae0 (diff)
downloadqtlocation-mapboxgl-9476b7a66f4864a1a10b083f6afe3bececd6fa84.tar.gz
Add JNI code to build system
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 54ee9e749c..20a1cc8702 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,8 @@ android:
export CPPFLAGS="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env CPPFLAGS` ${CPPFLAGS}" && \
export PATH="`MASON_DIR=./.mason MASON_PLATFORM=android ./.mason/mason env PATH`:${PATH}" && \
MASON_PLATFORM=android ./configure config-android.gypi && \
- deps/run_gyp mapboxgl.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
- $(MAKE) -C ./build/android BUILDTYPE=$(BUILDTYPE) V=$(V) mbgl-core
+ deps/run_gyp android/mapboxgl-app.gyp -Iconfig-android.gypi -Dplatform=android --depth=. --generator-output=./build/android -f make-android && \
+ $(MAKE) -C build/android BUILDTYPE=$(BUILDTYPE) V=$(V) androidapp
##### Test cases ###############################################################