Chang Apache release script to support NDK 18

apache · Jun 28, 2019 · 4d17cc6 · 4d17cc6
1 parent 0b79c76
commit 4d17cc6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/HOW-TO-BUILD.md b/HOW-TO-BUILD.md
@@ -16,7 +16,7 @@ The environment required to build weex is:
     * JDK 1.6+
     * Android SDK(`$ANDROID_HOME` must be set properly)
     * Gradle 2.0+
-    * NDK r18 and ndk 13 (**Both of them are needed**)
+    * NDK r18 
     * [Ninja 1.8.2+](https://ninja-build.org/)
     * CMake 3.9.0+
 * iOS SDK:
@@ -30,9 +30,9 @@ This article was tested in MacOSX system.
 # Build All by Script
 
 This script will build Android and iOS SDKs:
-> `$ bash scripts/build_from_source.sh $NDK13_dir $NDK_16dir`
+> `$ bash scripts/build_from_source.sh $NDK18_dir`
 
-The `$NDK13_dir` and `$NDK16_dir` should be the directory of NDK 13 and NDK 16, otherwise the Android build would failed.
+The `$NDK18_dir` and `$NDK16_dir` should be the directory of NDK 18, otherwise the Android build would failed.
 
 This may take a while. After that, you can look in `dist/`, `android/sdk/build/output/` and `ios/sdk/Products` for Web/Android/iOS SDK artifacts.
 

diff --git a/scripts/build_from_source.sh b/scripts/build_from_source.sh
@@ -45,41 +45,40 @@ cp dist/weex-rax.min.js pre-build/weex-rax-api.js
 # Build android_sdk
 if [ -d "android_sdk" ]
 then
-    git clone -b 0.23 --depth=1 git@github.com:alibaba/weex_js_engine.git
-    old_path=$PATH
+    git clone -b 0.24 --depth=1 git@github.com:alibaba/weex_js_engine.git
     export ANDROID_NDK=$1
     export PATH=$1:$PATH
     cd weex_js_engine/
 
     sh build.jsc.sh
-    cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/armeabi
     cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/armeabi-v7a
-
-    mkdir -p ../weex_core/Source/libs/armeabi
-    cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/armeabi
     mkdir -p ../weex_core/Source/libs/armeabi-v7a
     cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/armeabi-v7a
 
     rm -rf build32
+    sh build.jsc.sh -t arm64
+    cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/arm64-v8a
+    mkdir -p ../weex_core/Source/libs/arm64-v8a
+    cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/arm64-v8a
+
+    rm -rf build64
     sh build.jsc.sh -t x86
     cp libWTF.so libJavaScriptCore.so ../android_sdk/libs/x86
     mkdir -p ../weex_core/Source/libs/x86
     cp libWTF.so libJavaScriptCore.so ../weex_core/Source/libs/x86
 
-    PATH=$old_path
-    export ANDROID_NDK=$2
     cd ..
 
-    gradle wrapper --gradle-version 4.4
+    gradle wrapper --gradle-version 4.10.1
     echo 'include ":android_sdk"'>settings.gradle
-    echo "ndk.dir=$2">local.properties
+    echo "ndk.dir=$1">local.properties
 
     ./gradlew :android_sdk:clean :android_sdk:assembleRelease -PignoreVersionCheck="true" 
 
-    cp android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjsb.so android_sdk/libs/armeabi
-    cp android_sdk/.externalNativeBuild/cmake/release/armeabi/Source/android/jsengine/libweexjst.so android_sdk/libs/armeabi
     cp android_sdk/.externalNativeBuild/cmake/release/armeabi-v7a/Source/android/jsengine/libweexjsb.so android_sdk/libs/armeabi-v7a
     cp android_sdk/.externalNativeBuild/cmake/release/armeabi-v7a/Source/android/jsengine/libweexjst.so android_sdk/libs/armeabi-v7a
+    cp android_sdk/.externalNativeBuild/cmake/release/arm64-v8a/Source/android/jsengine/libweexjsb.so android_sdk/libs/armeabi
+    cp android_sdk/.externalNativeBuild/cmake/release/arm64-v8a/Source/android/jsengine/libweexjst.so android_sdk/libs/armeabi
     cp android_sdk/.externalNativeBuild/cmake/release/x86/Source/android/jsengine/libweexjsb.so android_sdk/libs/x86
     cp android_sdk/.externalNativeBuild/cmake/release/x86/Source/android/jsengine/libweexjst.so android_sdk/libs/x86