Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 0688a24

Browse files
YorkShenlucky-chen
authored andcommitted
[Android] Fix task order problem. (#2964)
* [Android] Fix task order problem. * Change shouldRunAfter to mustRunAfter * Change runAfter to dependsOn. * Update build.gradle
1 parent ce518bc commit 0688a24

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

android/sdk/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ apply plugin: 'checkstyle'
2626
apply plugin: 'com.jfrog.bintray'
2727
apply plugin: 'com.github.dcendents.android-maven'
2828

29-
apply from: 'buildSrc/asan.gradle'
3029
apply from: 'buildSrc/jcenter.gradle'
3130
apply from: 'buildSrc/unstripped.gradle'
3231
apply from: 'buildSrc/checkStyle.gradle'
3332
apply from: 'buildSrc/download_jsc.gradle'
3433
apply from: 'buildSrc/packageName.gradle'
34+
apply from: 'buildSrc/asan.gradle'
3535

3636
version = project.hasProperty('weexVersion') ? project.getProperty('weexVersion') : '0.26.0.1'
3737

@@ -228,7 +228,6 @@ android {
228228
}
229229

230230
dependencies {
231-
implementation fileTree(include: ['*.jar'], dir: 'libs')
232231
//noinspection GradleDependency
233232
compileOnly "com.android.support:recyclerview-v7:${project.supportLibVersion}"
234233
//noinspection GradleDependency
@@ -284,4 +283,4 @@ task weex_core_license(type: com.hierynomus.gradle.license.tasks.LicenseFormat)
284283
'Source/include/JavaScriptCore/**/*.cpp'])
285284
}
286285

287-
preBuild.dependsOn copyASanLib, checkNdkVersion, licenseFormat
286+
preBuild.dependsOn licenseFormat

android/sdk/buildSrc/asan.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ task copyWrapScript(type: Copy,dependsOn: clearASanLibs) {
4646
}
4747
}
4848
}
49-
task copyASanLib(type: Copy,dependsOn: copyWrapScript){
49+
task copyASanLib(type: Copy){
50+
dependsOn copyWrapScript, copyJscToJniDir
5051
if(project.hasProperty('enableASan') && "true" == project.getProperty('enableASan')) {
5152
def ndkPath = ndkDir == '' ? System.getenv("ANDROID_NDK_HOME"):ndkDir
5253
def dir = ndkPath + '/toolchains/llvm/prebuilt/'
@@ -67,4 +68,6 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){
6768
includeEmptyDirs = false
6869
}
6970
}
70-
}
71+
}
72+
73+
preBuild.dependsOn copyASanLib, checkNdkVersion

android/sdk/buildSrc/download_jsc.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ task unzipJSC(type: Copy, dependsOn: download) {
6060

6161
task copyJscToJniDir(type: Copy, dependsOn: unzipJSC) {
6262
def libsDir = project.android.sourceSets.main.jniLibs.srcDirs[-1]
63-
doFirst{
64-
delete libsDir
65-
}
6663
from zipTree(aar_file)
6764
into libsDir
6865
include 'jni/**/*.so'

0 commit comments

Comments
 (0)