You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by lu...@apache.org on 2019/08/26 07:12:55 UTC

[incubator-weex] 09/10: [Android] update jsc for jit

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

luckychen pushed a commit to branch feature/0.26.2.19-jit
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git

commit 724ea6a0138a7ee324fc1065472f9ba7d052ee70
Author: chen <qh...@gmail.com>
AuthorDate: Fri Aug 23 11:09:11 2019 +0800

    [Android] update jsc for jit
---
 android/sdk/build.gradle                           |  20 ++++++++++----------
 android/sdk/libs/armeabi-v7a/libJavaScriptCore.so  | Bin 5237568 -> 8852700 bytes
 android/sdk/libs/armeabi-v7a/libWTF.so             | Bin 472828 -> 378920 bytes
 weex_core/Source/android/jsengine/CMakeLists.txt   |   7 +++++++
 weex_core/Source/js_runtime/CMakeLists.txt         |   6 ++++++
 .../Source/libs/armeabi-v7a/libJavaScriptCore.so   | Bin 5237308 -> 0 bytes
 weex_core/Source/libs/armeabi-v7a/libWTF.so        | Bin 472828 -> 0 bytes
 weex_core/Source/libs/armeabi/libJavaScriptCore.so | Bin 5237308 -> 0 bytes
 weex_core/Source/libs/armeabi/libWTF.so            | Bin 472828 -> 0 bytes
 9 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index e183968..1f2645f 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -130,17 +130,17 @@ android {
         versionCode 1
         versionName project.version
         ndk {
-            if(!project.hasProperty('supportArmeabi-v7a') || "false" != project.getProperty('supportArmeabi-v7a')){
+          //  if(!project.hasProperty('supportArmeabi-v7a') || "false" != project.getProperty('supportArmeabi-v7a')){
                 abiFilters 'armeabi-v7a'
-            }
-
-            if(!project.hasProperty('supportArm64-v8a') || "false" != project.getProperty('supportArm64-v8a')){
-                abiFilters 'arm64-v8a'
-            }
-
-            if(!project.hasProperty('supportX86') || "false" != project.getProperty('supportX86')){
-                abiFilters 'x86'
-            }
+            //}
+
+//            if(!project.hasProperty('supportArm64-v8a') || "false" != project.getProperty('supportArm64-v8a')){
+//                abiFilters 'arm64-v8a'
+//            }
+//
+//            if(!project.hasProperty('supportX86') || "false" != project.getProperty('supportX86')){
+//                abiFilters 'x86'
+//            }
         }
         externalNativeBuild {
             cmake {
diff --git a/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so b/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so
index d6b471c..2eaa2af 100755
Binary files a/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so and b/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so differ
diff --git a/android/sdk/libs/armeabi-v7a/libWTF.so b/android/sdk/libs/armeabi-v7a/libWTF.so
index 790bef2..6e91e81 100755
Binary files a/android/sdk/libs/armeabi-v7a/libWTF.so and b/android/sdk/libs/armeabi-v7a/libWTF.so differ
diff --git a/weex_core/Source/android/jsengine/CMakeLists.txt b/weex_core/Source/android/jsengine/CMakeLists.txt
index fd61378..8162f1a 100644
--- a/weex_core/Source/android/jsengine/CMakeLists.txt
+++ b/weex_core/Source/android/jsengine/CMakeLists.txt
@@ -27,6 +27,10 @@ add_definitions(-DPRINT_LOG_CACHEFILE=0)
 add_definitions(-DOS_ANDROID)
 #add_definitions(-DNDEBUG)
 add_definitions(-DUSE_SYSTEM_MALLOC=1)
+
+add_definitions(-DENABLE_JIT=1)
+add_definitions(-DENABLE_FTL_JIT=1)
+add_definitions(-DENABLE_DFG_JIT=1)
 if (${ANDROID_PLATFORM} STREQUAL "android-21")
 else ()
     add_definitions(-D_POSIX_THREAD_KEYS_MAX=128)                              
@@ -52,6 +56,9 @@ else ()
 endif ()
 
 set(USE_SYSTEM_MALLOC 1)
+set(ENABLE_JIT 1)
+set(ENABLE_FTL_JIT 1)
+set(ENABLE_DFG_JIT 1)
 set(WEEXJSSERVER_NAME weexjss)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/weex_core/Source/js_runtime/CMakeLists.txt b/weex_core/Source/js_runtime/CMakeLists.txt
index 42bd160..bde108b 100644
--- a/weex_core/Source/js_runtime/CMakeLists.txt
+++ b/weex_core/Source/js_runtime/CMakeLists.txt
@@ -54,6 +54,9 @@ add_definitions(-DUSE_JS_RUNTIME=1)
 
 
 add_definitions(-DUSE_SYSTEM_MALLOC=1)
+add_definitions(-DENABLE_JIT=1)
+add_definitions(-DENABLE_FTL_JIT=1)
+add_definitions(-DENABLE_DFG_JIT=1)
 if (${ANDROID_PLATFORM} STREQUAL "android-21")
 else ()
     add_definitions(-D_POSIX_THREAD_KEYS_MAX=128)                              
@@ -79,6 +82,9 @@ else ()
 endif ()
 
 set(USE_SYSTEM_MALLOC 1)
+set(ENABLE_JIT 1)
+set(ENABLE_FTL_JIT 1)
+set(ENABLE_DFG_JIT 1)
 set(WEEXJSSERVER_NAME weexjss)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/weex_core/Source/libs/armeabi-v7a/libJavaScriptCore.so b/weex_core/Source/libs/armeabi-v7a/libJavaScriptCore.so
deleted file mode 100755
index 2d59099..0000000
Binary files a/weex_core/Source/libs/armeabi-v7a/libJavaScriptCore.so and /dev/null differ
diff --git a/weex_core/Source/libs/armeabi-v7a/libWTF.so b/weex_core/Source/libs/armeabi-v7a/libWTF.so
deleted file mode 100755
index 790bef2..0000000
Binary files a/weex_core/Source/libs/armeabi-v7a/libWTF.so and /dev/null differ
diff --git a/weex_core/Source/libs/armeabi/libJavaScriptCore.so b/weex_core/Source/libs/armeabi/libJavaScriptCore.so
deleted file mode 100755
index 2d59099..0000000
Binary files a/weex_core/Source/libs/armeabi/libJavaScriptCore.so and /dev/null differ
diff --git a/weex_core/Source/libs/armeabi/libWTF.so b/weex_core/Source/libs/armeabi/libWTF.so
deleted file mode 100755
index 790bef2..0000000
Binary files a/weex_core/Source/libs/armeabi/libWTF.so and /dev/null differ