fix(android): update arm64 so and should compile alone

Tencent · Apr 21, 2020 · ee65c8e · ee65c8e
1 parent 4d5fde8
commit ee65c8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -87,7 +87,11 @@ task compileCmake(dependsOn: copyCore, type: Exec) {
     cMakeWorkDir.mkdirs()
     setWorkingDir(cMakeWorkDir)
 
-    def arches = ["armeabi-v7a", "arm64-v8a", "x86", "x86_64"]
+    def arches = ["armeabi-v7a", "x86", "x86_64"]
+    // FIXME: arm64-v8a so can't compile with other arches, it only supports building standalone.
+    //        Comment on the orignal arches definitions, then uncomment the following lines and
+    //        line starts 179 to compile arm64-v8a
+    // def arches = ["arm64-v8a"]
     for (arch in arches) {
     commandLine findCmakeBuildPath(),
             "-DANDROID_ABI=${arch}",
@@ -176,12 +180,12 @@ task stripSO(dependsOn: compileNinja, type: Exec) {
             "-o",
             "$projectDir.absolutePath/libs/armeabi-v7a/libhippybridge.so"
 
-    commandLine getToolPathArm64("aarch64-linux-android-strip"),
-            "--strip-all",
-            "-x",
-            "$project.buildDir.absolutePath/outputs/arm64-v8a/libhippybridge.so",
-            "-o",
-            "$projectDir.absolutePath/libs/arm64-v8a/libhippybridge.so"
+//    commandLine getToolPathArm64("aarch64-linux-android-strip"),
+//            "--strip-all",
+//            "-x",
+//            "$project.buildDir.absolutePath/outputs/arm64-v8a/libhippybridge.so",
+//            "-o",
+//            "$projectDir.absolutePath/libs/arm64-v8a/libhippybridge.so"
 
     commandLine getToolPathX86("i686-linux-android-strip"),
             "--strip-all",

diff --git a/android/sdk/libs/arm64-v8a/libhippybridge.so b/android/sdk/libs/arm64-v8a/libhippybridge.so