This is an automated email from the ASF dual-hosted git repository. kyork pushed a commit to branch feature/remove_sharedLibrary in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
commit 67d542c545f1c8b00b67b2cfbeb291c9b0fece0c Author: YorkShen <[email protected]> AuthorDate: Thu Sep 26 15:40:19 2019 +0800 * Remove sharedLibrary for android. --- android/sdk/.gitignore | 2 +- android/sdk/build.gradle | 5 ++--- android/sdk/libs/arm64-v8a/libJavaScriptCore.so | Bin 9258456 -> 0 bytes android/sdk/libs/arm64-v8a/libWTF.so | Bin 522016 -> 0 bytes android/sdk/libs/armeabi-v7a/libJavaScriptCore.so | Bin 5237568 -> 0 bytes android/sdk/libs/armeabi-v7a/libWTF.so | Bin 472828 -> 0 bytes android/sdk/libs/x86/libJavaScriptCore.so | Bin 12134688 -> 0 bytes android/sdk/libs/x86/libWTF.so | Bin 488784 -> 0 bytes weex_core/Source/CMakeLists.txt | 2 +- 9 files changed, 4 insertions(+), 5 deletions(-) diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore index c149ebe..8074061 100755 --- a/android/sdk/.gitignore +++ b/android/sdk/.gitignore @@ -16,7 +16,7 @@ assets/weex-main-jsfm.js assets/weex-rax-api.js .externalNativeBuild -/libs/armeabi +/libs/ /src/main/jniLibs /src/legacyRelease/ diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 7902b65..75305d9 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -102,8 +102,8 @@ android { def android_project_dir = projectDir - def buildRuntimeApi = project.hasProperty('buildRuntimeApi') ? project.property('buildRuntimeApi').toBoolean() : false - def jsInterpolatorName = project.hasProperty('JSInterpolatorName') ? project.property('JSInterpolatorName') : 'JavaScriptCore' + def buildRuntimeApi = project.hasProperty('buildRuntimeApi') ? project.property('buildRuntimeApi').toBoolean() : true + def jsInterpolatorName = project.hasProperty('JSInterpolatorName') ? project.property('JSInterpolatorName') : 'jsc' defaultPublishConfig project.useApachePackageName ? 'apacheRelease' : 'legacyRelease' @@ -194,7 +194,6 @@ android { sourceSets { main.assets.srcDirs = ['assets'] - main.jniLibs.srcDirs = ['libs'] apacheRelease.java.srcDirs = ['src/main/java'] apacheRelease.manifest.srcFile(new File('src/main/AndroidManifest.xml')) legacyRelease.java.srcDirs = ['src/legacyRelease/java'] diff --git a/android/sdk/libs/arm64-v8a/libJavaScriptCore.so b/android/sdk/libs/arm64-v8a/libJavaScriptCore.so deleted file mode 100755 index 7f33280..0000000 Binary files a/android/sdk/libs/arm64-v8a/libJavaScriptCore.so and /dev/null differ diff --git a/android/sdk/libs/arm64-v8a/libWTF.so b/android/sdk/libs/arm64-v8a/libWTF.so deleted file mode 100755 index ce8d0bc..0000000 Binary files a/android/sdk/libs/arm64-v8a/libWTF.so and /dev/null differ diff --git a/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so b/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so deleted file mode 100755 index d6b471c..0000000 Binary files a/android/sdk/libs/armeabi-v7a/libJavaScriptCore.so and /dev/null differ diff --git a/android/sdk/libs/armeabi-v7a/libWTF.so b/android/sdk/libs/armeabi-v7a/libWTF.so deleted file mode 100755 index 790bef2..0000000 Binary files a/android/sdk/libs/armeabi-v7a/libWTF.so and /dev/null differ diff --git a/android/sdk/libs/x86/libJavaScriptCore.so b/android/sdk/libs/x86/libJavaScriptCore.so deleted file mode 100755 index 3cdfd01..0000000 Binary files a/android/sdk/libs/x86/libJavaScriptCore.so and /dev/null differ diff --git a/android/sdk/libs/x86/libWTF.so b/android/sdk/libs/x86/libWTF.so deleted file mode 100755 index 6d2bb48..0000000 Binary files a/android/sdk/libs/x86/libWTF.so and /dev/null differ diff --git a/weex_core/Source/CMakeLists.txt b/weex_core/Source/CMakeLists.txt index a412f8b..508aaea 100755 --- a/weex_core/Source/CMakeLists.txt +++ b/weex_core/Source/CMakeLists.txt @@ -42,7 +42,7 @@ add_definitions(-DDOM_PARSER_LOG=0) add_definitions(-DDEBUG=1) message("ANDROID_PROJECT_DIR:"${ANDROID_PROJECT_DIR}) -set(LOCAL_LIBRARIES_DIR ${ANDROID_PROJECT_DIR}/libs/${ANDROID_ABI}) +set(LOCAL_LIBRARIES_DIR ${ANDROID_PROJECT_DIR}/src/main/jniLibs/${ANDROID_ABI}) if ("${ANDROID_ABI}" STREQUAL "x86") # todo
