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

[Android] Fix task order problem. #2964

Merged
merged 4 commits into from
Oct 14, 2019
Merged

[Android] Fix task order problem. #2964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
738212c
[Android] Fix task order problem.
YorkShen Oct 12, 2019
2b4c879
Change shouldRunAfter to mustRunAfter
YorkShen Oct 12, 2019
c991fe5
Change runAfter to dependsOn.
YorkShen Oct 12, 2019
3c4399a
Update build.gradle
YorkShen Oct 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions android/sdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -228,7 +228,6 @@ android {
}

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

preBuild.dependsOn copyASanLib, checkNdkVersion, licenseFormat
preBuild.dependsOn licenseFormat
7 changes: 5 additions & 2 deletions android/sdk/buildSrc/asan.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/'
Expand All @@ -49,4 +50,6 @@ task copyASanLib(type: Copy,dependsOn: copyWrapScript){
includeEmptyDirs = false
}
}
}
}

preBuild.dependsOn copyASanLib, checkNdkVersion
3 changes: 0 additions & 3 deletions android/sdk/buildSrc/download_jsc.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down