diff options
author | Mikaël Peltier <mikaelpeltier@google.com> | 2017-10-05 10:50:30 +0200 |
---|---|---|
committer | Mikaël Peltier <mikaelpeltier@google.com> | 2017-10-05 10:50:30 +0200 |
commit | e116cb65e2e5103a622156a85ce3665da839f58c (patch) | |
tree | 35774095c7428aa3e5afc13ab62b092ba19f65ef /build.gradle | |
parent | 3f4ed60392779f87611de04a139f84965fe19b49 (diff) | |
download | r8-e116cb65e2e5103a622156a85ce3665da839f58c.tar.gz |
Update how art tests are built
- Do no longer build test with Jack since it is no longer alive.
- Directory that contains smali files is no longer only the smali
folder, it can be also the smali/art folder.
Change-Id: Id1d36edbf2f8b3b779485464f3a070cfbfdf12d0
Diffstat (limited to 'build.gradle')
-rw-r--r-- | build.gradle | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle index c7f13c142..9539df280 100644 --- a/build.gradle +++ b/build.gradle @@ -1185,6 +1185,8 @@ test { // out/host/linux-x86/bin directory of the android checkout. Currently this is version pre 2.2.1, // if that is updated the call to smali in "task "${smaliToDexTask}"(type: Exec)" below might // need to change as smali got a completely new command line interface in version 2.2.1. +// After Android O, Jack is no longer alive, do not forget to uncomment call to buildArtTest for +// Jack if you build an android version using Jack. // // PATH=$HOME/android/master/out/host/linux-x86/bin:$PATH tools/gradle.py -Pandroid_source buildArtTests // @@ -1303,7 +1305,8 @@ if (project.hasProperty('android_source')) { if (!(name in skippedTestsDx)) { dependsOn buildArtTest(androidCheckoutDir, artTestBuildDir, dir, DexTool.DX); } - dependsOn buildArtTest(androidCheckoutDir, artTestBuildDir, dir, DexTool.JACK); + // After Android O, Jack is no longer alive + //dependsOn buildArtTest(androidCheckoutDir, artTestBuildDir, dir, DexTool.JACK); } } } @@ -1426,7 +1429,13 @@ def buildArtTest(androidCheckoutDir, artTestBuildDir, dir, dexTool) { } task "${smaliToDexTask}"(type: Exec) { - workingDir "${testDir}/smali" + // Directory that contains smali files is either smali, or smali/art + def smali_dir = file("${dir}/smali/art") + if (smali_dir.exists()) { + workingDir "${testDir}/smali/art" + } else { + workingDir "${testDir}/smali" + } executable "/bin/bash" // This is the command line options for smali prior to 2.2.1, where smali got a new // command line interface. |