diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2015-06-19 09:17:59 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2015-06-19 09:30:17 +0200 |
| commit | b45c7ca3931f4f3cb150d9611ec78ed36678bcf7 (patch) | |
| tree | e00ce447d4fc3c9cc16cd619970eaaf427c0175e | |
| parent | 78b4084303943d7577cdba13e169fa853dcfe8b1 (diff) | |
| download | toolchain_jack-b45c7ca3931f4f3cb150d9611ec78ed36678bcf7.tar.gz toolchain_jack-b45c7ca3931f4f3cb150d9611ec78ed36678bcf7.tar.bz2 toolchain_jack-b45c7ca3931f4f3cb150d9611ec78ed36678bcf7.zip | |
Update path of jpp file used by MultiDex tests
Change-Id: Icadfa334cc3152fe5a830199d10ae3c3ea3d41b8
(cherry picked from commit 833cd465bf28f3c89018b2f197c4890083cb3793)
| -rw-r--r-- | jack-tests/tests/com/android/jack/multidex/MultiDexTests.java | 4 |
1 files changed, 2 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 e9ec8872..faeb8718 100644 --- a/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java +++ b/jack-tests/tests/com/android/jack/multidex/MultiDexTests.java @@ -411,7 +411,7 @@ public class MultiDexTests { File out = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackCliToolchain.class); - addCommonOptionsForMultiDex(toolchain, new File(testFolder,"config-001.jpp")); + addCommonOptionsForMultiDex(toolchain, new File(testFolder,"../../jpp/config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "multidex"); toolchain.addProperty(Options.USE_DEFAULT_LIBRARIES.getName(), "true"); @@ -438,7 +438,7 @@ public class MultiDexTests { File out = AbstractTestTools.createTempDir(); JackBasedToolchain toolchain = AbstractTestTools.getCandidateToolchain(JackCliToolchain.class); - addCommonOptionsForMultiDex(toolchain, new File(testFolder,"config-001.jpp")); + addCommonOptionsForMultiDex(toolchain, new File(testFolder,"../../jpp/config-001.jpp")); toolchain.addProperty(DexFileWriter.DEX_WRITING_POLICY.getName(), "minimal-multidex"); toolchain.addStaticLibs(library); |