From 738212c60ad3ac8cf4dd23aedc717a9e5f677843 Mon Sep 17 00:00:00 2001 From: YorkShen Date: Sat, 12 Oct 2019 14:59:35 +0800 Subject: [PATCH 1/4] [Android] Fix task order problem. --- android/sdk/build.gradle | 4 ++-- android/sdk/buildSrc/asan.gradle | 5 ++++- android/sdk/buildSrc/packageName.gradle | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index eb179e6330..1791e04c0e 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' @@ -284,4 +284,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 1413f28ec0..bd1a9ca4cf 100644 --- a/android/sdk/buildSrc/asan.gradle +++ b/android/sdk/buildSrc/asan.gradle @@ -49,4 +49,7 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){ includeEmptyDirs = false } } -} \ No newline at end of file +} + +preBuild.dependsOn copyASanLib, checkNdkVersion +copyASanLib.shouldRunAfter copyJscToJniDir \ No newline at end of file diff --git a/android/sdk/buildSrc/packageName.gradle b/android/sdk/buildSrc/packageName.gradle index cae55df597..72b963fb25 100644 --- a/android/sdk/buildSrc/packageName.gradle +++ b/android/sdk/buildSrc/packageName.gradle @@ -55,8 +55,7 @@ task copyOtherCppFile(type: Copy){ } } -task copyAndRenameCppSourceFile(type: Copy){ - dependsOn copyOtherCppFile, copyJSCHeaderToWeexCore +task copyAndRenameCppSourceFile(type: Copy, dependsOn: copyOtherCppFile){ if(!project.useApachePackageName) { inputs.dir new File('../../weex_core') from new File('../../weex_core') @@ -81,4 +80,5 @@ gradle.taskGraph.beforeTask { Task task -> } preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyProguard -clean.dependsOn cleanCopyAndRenamePackage, cleanCopyManifest, cleanCopyProguard, cleanCopyOtherCppFile, cleanCopyAndRenameCppSourceFile \ No newline at end of file +clean.dependsOn cleanCopyAndRenamePackage, cleanCopyManifest, cleanCopyProguard, cleanCopyOtherCppFile, cleanCopyAndRenameCppSourceFile +copyAndRenameCppSourceFile.shouldRunAfter copyJSCHeaderToWeexCore \ No newline at end of file From 2b4c8796ccf65f611e2bbace94b9571b2a5d4e89 Mon Sep 17 00:00:00 2001 From: YorkShen Date: Sat, 12 Oct 2019 15:37:19 +0800 Subject: [PATCH 2/4] Change shouldRunAfter to mustRunAfter --- android/sdk/buildSrc/asan.gradle | 2 +- android/sdk/buildSrc/packageName.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/sdk/buildSrc/asan.gradle b/android/sdk/buildSrc/asan.gradle index bd1a9ca4cf..2b3794dc5d 100644 --- a/android/sdk/buildSrc/asan.gradle +++ b/android/sdk/buildSrc/asan.gradle @@ -52,4 +52,4 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){ } preBuild.dependsOn copyASanLib, checkNdkVersion -copyASanLib.shouldRunAfter copyJscToJniDir \ No newline at end of file +copyASanLib.mustRunAfter copyJscToJniDir \ No newline at end of file diff --git a/android/sdk/buildSrc/packageName.gradle b/android/sdk/buildSrc/packageName.gradle index 72b963fb25..c9619cdf02 100644 --- a/android/sdk/buildSrc/packageName.gradle +++ b/android/sdk/buildSrc/packageName.gradle @@ -81,4 +81,4 @@ gradle.taskGraph.beforeTask { Task task -> preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyProguard clean.dependsOn cleanCopyAndRenamePackage, cleanCopyManifest, cleanCopyProguard, cleanCopyOtherCppFile, cleanCopyAndRenameCppSourceFile -copyAndRenameCppSourceFile.shouldRunAfter copyJSCHeaderToWeexCore \ No newline at end of file +copyAndRenameCppSourceFile.mustRunAfter copyJSCHeaderToWeexCore \ No newline at end of file From c991fe51f1fe7bf6c3e8c75140abde2a2a7e7ffc Mon Sep 17 00:00:00 2001 From: YorkShen Date: Sat, 12 Oct 2019 16:03:33 +0800 Subject: [PATCH 3/4] Change runAfter to dependsOn. --- android/sdk/buildSrc/asan.gradle | 6 +++--- android/sdk/buildSrc/packageName.gradle | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/sdk/buildSrc/asan.gradle b/android/sdk/buildSrc/asan.gradle index 2b3794dc5d..32f635c148 100644 --- a/android/sdk/buildSrc/asan.gradle +++ b/android/sdk/buildSrc/asan.gradle @@ -28,7 +28,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/' @@ -51,5 +52,4 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){ } } -preBuild.dependsOn copyASanLib, checkNdkVersion -copyASanLib.mustRunAfter copyJscToJniDir \ No newline at end of file +preBuild.dependsOn copyASanLib, checkNdkVersion \ No newline at end of file diff --git a/android/sdk/buildSrc/packageName.gradle b/android/sdk/buildSrc/packageName.gradle index c9619cdf02..cae55df597 100644 --- a/android/sdk/buildSrc/packageName.gradle +++ b/android/sdk/buildSrc/packageName.gradle @@ -55,7 +55,8 @@ task copyOtherCppFile(type: Copy){ } } -task copyAndRenameCppSourceFile(type: Copy, dependsOn: copyOtherCppFile){ +task copyAndRenameCppSourceFile(type: Copy){ + dependsOn copyOtherCppFile, copyJSCHeaderToWeexCore if(!project.useApachePackageName) { inputs.dir new File('../../weex_core') from new File('../../weex_core') @@ -80,5 +81,4 @@ gradle.taskGraph.beforeTask { Task task -> } preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyProguard -clean.dependsOn cleanCopyAndRenamePackage, cleanCopyManifest, cleanCopyProguard, cleanCopyOtherCppFile, cleanCopyAndRenameCppSourceFile -copyAndRenameCppSourceFile.mustRunAfter copyJSCHeaderToWeexCore \ No newline at end of file +clean.dependsOn cleanCopyAndRenamePackage, cleanCopyManifest, cleanCopyProguard, cleanCopyOtherCppFile, cleanCopyAndRenameCppSourceFile \ No newline at end of file From 3c4399abdcfa36ec7363997527da1b61b94dc79f Mon Sep 17 00:00:00 2001 From: YorkShen Date: Sat, 12 Oct 2019 17:13:16 +0800 Subject: [PATCH 4/4] Update build.gradle --- android/sdk/build.gradle | 1 - android/sdk/buildSrc/download_jsc.gradle | 3 --- 2 files changed, 4 deletions(-) diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle index 1791e04c0e..ecd11828a5 100755 --- a/android/sdk/build.gradle +++ b/android/sdk/build.gradle @@ -228,7 +228,6 @@ android { } dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') //noinspection GradleDependency compileOnly "com.android.support:recyclerview-v7:${project.supportLibVersion}" //noinspection GradleDependency diff --git a/android/sdk/buildSrc/download_jsc.gradle b/android/sdk/buildSrc/download_jsc.gradle index fdb7ad00b2..808675a483 100644 --- a/android/sdk/buildSrc/download_jsc.gradle +++ b/android/sdk/buildSrc/download_jsc.gradle @@ -42,9 +42,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'