[incubator-weex] branch master updated: [Android] Fix task order problem. (#2964)

[luckychen]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 0688a24  [Android] Fix task order problem. (#2964)
0688a24 is described below

commit 0688a2419a0f9ee2270dc8092acb9065c16e9b21
Author: YorkShen <shenyua...@gmail.com>
AuthorDate: Mon Oct 14 11:05:24 2019 +0800

    [Android] Fix task order problem. (#2964)
    
    * [Android] Fix task order problem.
    
    * Change shouldRunAfter to mustRunAfter
    
    * Change runAfter to dependsOn.
    
    * Update build.gradle
---
 android/sdk/build.gradle                 | 5 ++---
 android/sdk/buildSrc/asan.gradle         | 7 +++++--
 android/sdk/buildSrc/download_jsc.gradle | 3 ---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index eb179e6..ecd1182 100755
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -26,12 +26,12 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 
-apply from: 'buildSrc/asan.gradle'
 apply from: 'buildSrc/jcenter.gradle'
 apply from: 'buildSrc/unstripped.gradle'
 apply from: 'buildSrc/checkStyle.gradle'
 apply from: 'buildSrc/download_jsc.gradle'
 apply from: 'buildSrc/packageName.gradle'
+apply from: 'buildSrc/asan.gradle'
 
 version = project.hasProperty('weexVersion') ? 
project.getProperty('weexVersion') : '0.26.0.1'
 
@@ -228,7 +228,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     //noinspection GradleDependency
     compileOnly 
"com.android.support:recyclerview-v7:${project.supportLibVersion}"
     //noinspection GradleDependency
@@ -284,4 +283,4 @@ task weex_core_license(type: 
com.hierynomus.gradle.license.tasks.LicenseFormat)
                      'Source/include/JavaScriptCore/**/*.cpp'])
 }
 
-preBuild.dependsOn copyASanLib, checkNdkVersion, licenseFormat
\ No newline at end of file
+preBuild.dependsOn licenseFormat
\ No newline at end of file
diff --git a/android/sdk/buildSrc/asan.gradle b/android/sdk/buildSrc/asan.gradle
index 0042851..df81979 100644
--- a/android/sdk/buildSrc/asan.gradle
+++ b/android/sdk/buildSrc/asan.gradle
@@ -46,7 +46,8 @@ task copyWrapScript(type: Copy,dependsOn: clearASanLibs) {
         }
     }
 }
-task copyASanLib(type: Copy,dependsOn: copyWrapScript){
+task copyASanLib(type: Copy){
+    dependsOn copyWrapScript, copyJscToJniDir
     if(project.hasProperty('enableASan') && "true" == 
project.getProperty('enableASan')) {
         def ndkPath = ndkDir == '' ? System.getenv("ANDROID_NDK_HOME"):ndkDir
         def dir = ndkPath + '/toolchains/llvm/prebuilt/'
@@ -67,4 +68,6 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){
             includeEmptyDirs = false
         }
     }
-}
\ No newline at end of file
+}
+
+preBuild.dependsOn copyASanLib, checkNdkVersion
\ No newline at end of file
diff --git a/android/sdk/buildSrc/download_jsc.gradle 
b/android/sdk/buildSrc/download_jsc.gradle
index f9447f6..a83fafe 100644
--- a/android/sdk/buildSrc/download_jsc.gradle
+++ b/android/sdk/buildSrc/download_jsc.gradle
@@ -60,9 +60,6 @@ task unzipJSC(type: Copy, dependsOn: download) {
 
 task copyJscToJniDir(type: Copy, dependsOn: unzipJSC) {
     def libsDir = project.android.sourceSets.main.jniLibs.srcDirs[-1]
-    doFirst{
-        delete libsDir
-    }
     from zipTree(aar_file)
     into libsDir
     include 'jni/**/*.so'