diff options
| -rw-r--r-- | jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java | 2 | ||||
| -rw-r--r-- | jack-tests/tests/com/android/jack/tools/merger/MergerTestTools.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java b/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java index b9d8669..65cef18 100644 --- a/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java +++ b/jack-tests/src/com/android/jack/test/helper/JackDexMergerTestHelper.java @@ -68,7 +68,7 @@ public class JackDexMergerTestHelper extends SourceToDexComparisonTestHelper { toolchain.addProperty(Options.EMIT_LINE_NUMBER_DEBUG_INFO.getName(), Boolean.toString(withDebugInfos)); toolchain.addProperty(ScheduleInstance.DEFAULT_RUNNER.getName(), "single-threaded"); - toolchain.addProperty(Options.TYPEDEX_DIR.getName(), + toolchain.addProperty(Options.INTERMEDIATE_DEX_DIR.getName(), oneDexPerTypeFolder.getAbsolutePath()); } catch (IOException e) { throw new AssertionError(e); 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); |