Merge pull request #2307 from YorkShen/android_playground_build

* [Android] Fix android playground run unexpectedly on arm-v7a platform
apache · Apr 12, 2019 · be06e3a · be06e3a
2 parents b4b7703 + b6b4b06
commit be06e3a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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 {