diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-10-16 09:17:00 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-10-16 09:17:00 +0200 |
| commit | 44d0e55884c12bfc22f36fd632d7275f6bac6f8b (patch) | |
| tree | 5bb3c6877dd133cf2a2ef57de499f67c284e46d1 /jack-tests/tests/com/android | |
| parent | 1e2b733af396c2ea339ebb24343d15ae0fdc39e9 (diff) | |
| download | toolchain_jack-44d0e55884c12bfc22f36fd632d7275f6bac6f8b.zip toolchain_jack-44d0e55884c12bfc22f36fd632d7275f6bac6f8b.tar.gz toolchain_jack-44d0e55884c12bfc22f36fd632d7275f6bac6f8b.tar.bz2 | |
Fix merging problem due to TYPEDEX_DIR renaming
Change-Id: I9897c68dfa1ca642d7baa9c6a9dd11db5dd7e60a
Diffstat (limited to 'jack-tests/tests/com/android')
| -rw-r--r-- | jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java index dab9e7e..b163f5b 100644 --- a/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java +++ b/jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java @@ -44,7 +44,7 @@ public class MergerTestTools { toolchain.addProperty(Options.EMIT_LINE_NUMBER_DEBUG_INFO.getName(), Boolean.toString(withDebug)); toolchain.addProperty(ScheduleInstance.DEFAULT_RUNNER.getName(), "single-threaded"); - toolchain.addProperty(Options.TYPEDEX_DIR.getName(), + toolchain.addProperty(Options.INTERMEDIATE_DEX_DIR.getName(), multiDexOnTypePerTypeFolder.getAbsolutePath()); toolchain.srcToExe(classpath, multiDexFolder, sourceFolder); |