[incubator-weex] branch master updated: * [Android] Remove armABIOnly flag, which will cause 32 bits so and 64 bits cross link problem.

[ji...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jianhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new b6b4b06  * [Android] Remove armABIOnly flag, which will cause 32 bits so and 64 bits cross link problem.
     new be06e3a  Merge pull request #2307 from YorkShen/android_playground_build
b6b4b06 is described below

commit b6b4b06d5cc5b336fd1f4275a107c91202d64325
Author: YorkShen <sh...@gmail.com>
AuthorDate: Fri Apr 12 01:12:02 2019 +0800

    * [Android] Remove armABIOnly flag, which will cause 32 bits so and 64 bits cross link problem.
---
 android/build.gradle     | 2 --
 android/sdk/build.gradle | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index d28291e..dc14147 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -50,8 +50,6 @@ subprojects {
         targetSdkVersion=26
         supportLibVersion="26.0.2"
         fastjsonLibVersion="1.1.46.android"
-        //Default value for armABIOnly is true
-        armABIOnly = !project.hasProperty("armABIOnly") || armABIOnly.equals('true')
         //Default value for buildCpp is true
         buildCpp = !project.hasProperty("buildCpp") || buildCpp.equals("true")
         //Default value for disableCov is false
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 039b6d6..0e3183d 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -137,11 +137,7 @@ android {
         versionCode 1
         versionName project.version
         ndk {
-            if (project.armABIOnly){
-                abiFilters "armeabi"
-            } else {
-                abiFilters "armeabi-v7a", "armeabi", "x86"
-            }
+            abiFilters "armeabi-v7a", "armeabi", "x86"
         }
         externalNativeBuild {
             cmake {