summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-09-03 11:51:55 -0700
committerJustin R. Miller <incanus@codesorcery.net>2015-09-04 09:13:33 -0700
commit264f3d8679fea06df48ae51d03837dde97812f45 (patch)
treec43098c0328d519edcb0ad6abe3261c19d2ef790
parent4d069207b9ec325796d5dadfb4603fa9d2bcf0ba (diff)
downloadqtlocation-mapboxgl-264f3d8679fea06df48ae51d03837dde97812f45.tar.gz
`make android-all -> make apackage` to be more in line with iOS distribution
-rw-r--r--INSTALL.md4
-rw-r--r--Makefile8
2 files changed, 8 insertions, 4 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 669aba3f9d..fcc5d90c63 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -315,6 +315,10 @@ When you plug your device in and then run or debug the Android project you will
If your device does not show up, you have not set it up properly. Double check the [Google documentation](http://developer.android.com/tools/device.html).
+### Distribution
+
+Use the `Makefile` target `make apackage` in order to build JNI libraries for all supported ABI's for eventual distribution of the whole package.
+
### Target
Devices running Android 4.0+ (API level 14+).
diff --git a/Makefile b/Makefile
index c901f645a8..57382d23e7 100644
--- a/Makefile
+++ b/Makefile
@@ -74,10 +74,10 @@ android-lib: ; $(RUN) HOST=android Makefile/androidapp
android: android-lib
cd android/java && ./gradlew --parallel --max-workers=$(JOBS) assemble$(BUILDTYPE)
-# Builds all android architectures.
-android-all: android-lib-arm-v5 android-lib-arm-v7 android-lib-arm-v8
-android-all: android-lib-x86 android-lib-x86-64
-android-all: android-lib-mips android-lib-mips-64
+# Builds all android architectures for distribution.
+apackage: android-lib-arm-v5 android-lib-arm-v7 android-lib-arm-v8
+apackage: android-lib-x86 android-lib-x86-64
+apackage: android-lib-mips android-lib-mips-64
cd android/java && ./gradlew --parallel-threads=$(JOBS) assemble$(BUILDTYPE)
# Builds the Node.js library