[GitHub] YorkShen closed pull request #1830: * [Android] Remove libweexcore from git

[GitBox]

YorkShen closed pull request #1830: * [Android] Remove libweexcore from git
URL: https://github.com/apache/incubator-weex/pull/1830
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore
index 2a5a057771..25d11795bb 100755
--- a/android/sdk/.gitignore
+++ b/android/sdk/.gitignore
@@ -13,4 +13,7 @@ gen
 lint.xml
 project.properties
 assets/main.js
-.externalNativeBuild
\ No newline at end of file
+.externalNativeBuild
+libs/armeabi/libweexcore.so
+libs/armeabi-v7a/libweexcore.so
+libs/x86/libweexcore.so
\ No newline at end of file
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index f31a4f6979..c696b11d7c 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -44,11 +44,6 @@ android {
     compileSdkVersion project.compileSdkVersion
     buildToolsVersion project.buildToolsVersion
     resourcePrefix "weex"
-
-    delete 'libs/armeabi/libweexcore.so'
-    delete 'libs/armeabi-v7a/libweexcore.so'
-    delete 'libs/x86/libweexcore.so'
-
     useLibrary 'org.apache.http.legacy'
     copy {
         from '../../pre-build'
@@ -211,6 +206,7 @@ if(file('../license/LICENSE').exists()){
         header = file('../license/LICENSE')
         mapping('cpp','JAVADOC_STYLE')
         mapping('h','JAVADOC_STYLE')
+        excludes(['com/taobao/weex/utils/WXDataStructureUtil.java'])
     }
 
     task weex_core_license(type: 
com.hierynomus.gradle.license.tasks.LicenseFormat){
diff --git a/android/sdk/libs/armeabi-v7a/libweexcore.so 
b/android/sdk/libs/armeabi-v7a/libweexcore.so
deleted file mode 100644
index 4b1cac43ff..0000000000
Binary files a/android/sdk/libs/armeabi-v7a/libweexcore.so and /dev/null differ
diff --git a/android/sdk/libs/armeabi/libweexcore.so 
b/android/sdk/libs/armeabi/libweexcore.so
deleted file mode 100644
index 1be8d2be56..0000000000
Binary files a/android/sdk/libs/armeabi/libweexcore.so and /dev/null differ
diff --git a/android/sdk/libs/x86/libweexcore.so 
b/android/sdk/libs/x86/libweexcore.so
deleted file mode 100644
index e4c3a3b8fa..0000000000
Binary files a/android/sdk/libs/x86/libweexcore.so and /dev/null differ


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services