diff options
| author | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-18 15:57:51 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-18 17:33:13 +0200 |
| commit | 31ca3ca07afdfc2106827ae6933e2a66fc079686 (patch) | |
| tree | 1db2e7fe2431ba8b1704c7bc4d01eb7193db7dab /jack-tests/tests | |
| parent | 9710b9e7636502040fde2bcc07c890337568e5ca (diff) | |
| download | toolchain_jack-31ca3ca07afdfc2106827ae6933e2a66fc079686.zip toolchain_jack-31ca3ca07afdfc2106827ae6933e2a66fc079686.tar.gz toolchain_jack-31ca3ca07afdfc2106827ae6933e2a66fc079686.tar.bz2 | |
Fix long MultiDexTests
JPP file has moved.
(cherry picked from commit 886e13d068b0d7dd1408743dd6b673c4816b60fe)
Change-Id: I8760d31c6c981ebda35ecdcf0011b11600aa250a
Diffstat (limited to 'jack-tests/tests')
| -rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexTests.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java index c44602a..e9ec887 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java @@ -314,7 +314,8 @@ public class MultiDexTests { JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); - addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); + File jppDir = AbstractTestTools.getTestRootDir("com.android.jack.multidex.jpp"); + addCommonOptionsForMultiDex(toolchain, new File(jppDir, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false"); @@ -345,7 +346,8 @@ public class MultiDexTests { JackApiToolchainBase toolchain = AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); - addCommonOptionsForMultiDex(toolchain, new File(testFolder, "config-001.jpp")); + File jppDir = AbstractTestTools.getTestRootDir("com.android.jack.multidex.jpp"); + addCommonOptionsForMultiDex(toolchain, new File(jppDir, "config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(library); toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "false"); |