From 264f3d8679fea06df48ae51d03837dde97812f45 Mon Sep 17 00:00:00 2001 From: "Justin R. Miller" Date: Thu, 3 Sep 2015 11:51:55 -0700 Subject: [PATCH] `make android-all -> make apackage` to be more in line with iOS distribution --- INSTALL.md | 4 ++++ Makefile | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 669aba3f9..fcc5d90c6 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 c901f645a..57382d23e 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