summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-10-10 11:13:49 +0200
committerParménides GV <parmegv@sdf.org>2014-10-10 11:13:49 +0200
commit8bc58f450262ba2cf64e92772746b62018f80e59 (patch)
treeb142a2493fa765b30274f966eefebae9910d8bee /app
parente1914c01b836d5798f19a3e8dec1a25e064f9f19 (diff)
parentb82684020a657d410c62e7eca26d72b27cdc6561 (diff)
Merge branch 'feature/Automatically-execute-ndk-build-from-gradle-#5435' into develop
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle7
-rw-r--r--app/jni/Application.mk2
2 files changed, 8 insertions, 1 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 1057da44..9207ff84 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -156,6 +156,13 @@ task updateIcsOpenVpn( type: Copy, dependsOn: 'mergeUntranslatable') {
} into '.'
}
+task buildNative ( type: Exec ) {
+
+ commandLine 'sh', 'misc/build-native.sh', 'USE_BREAKPAD=0', '-j 8'
+}
+
+preBuild.dependsOn buildNative
+
//assembleRelease.dependsOn connectedCheck
afterEvaluate {
//installRelease.dependsOn connectedCheck
diff --git a/app/jni/Application.mk b/app/jni/Application.mk
index f85269d8..b7af50cd 100644
--- a/app/jni/Application.mk
+++ b/app/jni/Application.mk
@@ -1,4 +1,4 @@
-APP_ABI := all32
+APP_ABI := arm64-v8a armeabi armeabi-v7a mips x86 x86_64
APP_PLATFORM := android-14
APP_STL:=stlport_shared