diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-10-24 16:51:08 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-10-25 09:24:50 +0200 |
| commit | ec002b18054f72a7682a2a875ad7e9e9e1d0ce81 (patch) | |
| tree | 309f307394a6f04d8a727ff056d09b1f0852057b /jack-tests/Android.mk | |
| parent | 16393941dbecd656bdd67b705a9675859a3ef696 (diff) | |
| download | toolchain_jack-ec002b18054f72a7682a2a875ad7e9e9e1d0ce81.zip toolchain_jack-ec002b18054f72a7682a2a875ad7e9e9e1d0ce81.tar.gz toolchain_jack-ec002b18054f72a7682a2a875ad7e9e9e1d0ce81.tar.bz2 | |
Adapt build to Change in Jack command line
Also restore 2 undocumented options used by build of vm-test-tf
Change-Id: I87284ca4122045f45be9702a1fd8985acda78b4c
Diffstat (limited to 'jack-tests/Android.mk')
| -rw-r--r-- | jack-tests/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jack-tests/Android.mk b/jack-tests/Android.mk index 74c3211..2f0e498 100644 --- a/jack-tests/Android.mk +++ b/jack-tests/Android.mk @@ -42,11 +42,11 @@ test-jack-incremental: $(JACK_JAR) $(hide) $(eval TEMPDIR_DEX_FROM_JACK := $(shell mktemp -d)) $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \ -D jack.jackfile.generate=true -D jack.jackfile.output.container=dir \ - -D jack.jackfile.output.dir=$(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput -o \ + -D jack.jackfile.output.dir=$(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput --output-dex \ $(TEMPDIR_DEX_FROM_JAVA) \ - --ecj -nowarn @$(ANDROID_BUILD_TOP)/out/target/common/obj/JAVA_LIBRARIES/core_intermediates/sources.list + @$(ANDROID_BUILD_TOP)/out/target/common/obj/JAVA_LIBRARIES/core_intermediates/sources.list $(hide) $(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \ - --output $(TEMPDIR_DEX_FROM_JACK) --import-jack $(TEMPDIR_DEX_FROM_JAVA)/jackIncrementalOutput + --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 $(hide) dexdump -d $(TEMPDIR_DEX_FROM_JACK)/classes.dex | tail -n +3 &> $(TEMPDIR_DEX_FROM_JACK)/coreDexFromJack.txt $(hide) diff --side-by-side --suppress-common-lines $(TEMPDIR_DEX_FROM_JAVA)/coreDexFromJava.txt \ |