diff options
author | Yohann Roussel <yroussel@google.com> | 2014-11-20 12:22:14 +0100 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2014-11-20 12:22:14 +0100 |
commit | dc5de3791ebc2da6c606e534c244d36e2991a85c (patch) | |
tree | b1347e4071bfa1e9e188b225a7ca23e6873d7e63 | |
parent | e60f957fa4d4b93d0dcd4cab75e2d50702d779f3 (diff) | |
download | toolchain_jack-dc5de3791ebc2da6c606e534c244d36e2991a85c.tar.gz toolchain_jack-dc5de3791ebc2da6c606e534c244d36e2991a85c.tar.bz2 toolchain_jack-dc5de3791ebc2da6c606e534c244d36e2991a85c.zip |
Sources lists name has changed
Rename references made by tests.
Change-Id: I43cab20133ef4ab73f873c6f1e9aa480c45a7c99
-rw-r--r-- | jack-tests/Android.mk | 2 | ||||
-rw-r--r-- | jack/tests/com/android/jack/TestTools.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jack-tests/Android.mk b/jack-tests/Android.mk index 0d2b8f39..b0b2e6c7 100644 --- a/jack-tests/Android.mk +++ b/jack-tests/Android.mk @@ -43,7 +43,7 @@ test-jack-incremental: $(JACK_JAR) $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \ --output-jack-dir $(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput --output-dex \ $(TEMPDIR_DEX_FROM_JAVA) \ - @$(ANDROID_BUILD_TOP)/out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/jayces.java-source-list + @$(ANDROID_BUILD_TOP)/out/target/common/obj/JAVA_LIBRARIES/core-libart_intermediates/jack.java-source-list $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \ --output-dex $(TEMPDIR_DEX_FROM_JACK) --import $(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput $(hide) dexdump -d $(TEMPDIR_DEX_FROM_JAVA)/classes.dex | tail -n +3 &> $(TEMPDIR_DEX_FROM_JAVA)/coreDexFromJava.txt diff --git a/jack/tests/com/android/jack/TestTools.java b/jack/tests/com/android/jack/TestTools.java index e3643bd9..dd6393b3 100644 --- a/jack/tests/com/android/jack/TestTools.java +++ b/jack/tests/com/android/jack/TestTools.java @@ -175,19 +175,19 @@ public class TestTools { @Nonnull public static Sourcelist getTargetLibSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/target/common/obj/JAVA_LIBRARIES/" + moduleName - + "_intermediates/jayces.java-source-list"); + + "_intermediates/jack.java-source-list"); } @Nonnull public static Sourcelist getHostLibSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/host/common/obj/JAVA_LIBRARIES/" + moduleName - + "_intermediates/jayces.java-source-list"); + + "_intermediates/jack.java-source-list"); } @Nonnull public static Sourcelist getTargetAppSourcelist(@Nonnull String moduleName) { return getSourcelistWithAbsPath("out/target/common/obj/APPS/" + moduleName - + "_intermediates/jayces.java-source-list"); + + "_intermediates/jack.java-source-list"); } @Nonnull |