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 | |
| 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')
8 files changed, 11 insertions, 11 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 \ diff --git a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk index 9ad826e..844d8a7 100644 --- a/jack-tests/tests/com/android/jack/jarjar/test001/test.mk +++ b/jack-tests/tests/com/android/jack/jarjar/test001/test.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := jarjar/test001 -JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt +JACKTEST_ARGS := --config-jarjar $(LOCAL_PATH)/jarjar-rules.txt JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx) JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests diff --git a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk index dca8609..ced29cd 100644 --- a/jack-tests/tests/com/android/jack/jarjar/test003/test.mk +++ b/jack-tests/tests/com/android/jack/jarjar/test003/test.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := jarjar/test003 -JACKTEST_ARGS := --jarjar-rules $(LOCAL_PATH)/jarjar-rules.txt +JACKTEST_ARGS := --config-jarjar $(LOCAL_PATH)/jarjar-rules.txt JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := $(call all-java-files-under, dx) JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests diff --git a/jack-tests/tests/com/android/jack/shrob/test011/test.mk b/jack-tests/tests/com/android/jack/shrob/test011/test.mk index 3b06de4..15d8f46 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/test.mk +++ b/jack-tests/tests/com/android/jack/shrob/test011/test.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := shrob/test011 -JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 --proguard-flags $(LOCAL_PATH)/../dontobfuscate.flags +JACKTEST_ARGS := --config-proguard $(LOCAL_PATH)/proguard.flags001 --config-proguard $(LOCAL_PATH)/../dontobfuscate.flags JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := dx/Tests.java JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests diff --git a/jack-tests/tests/com/android/jack/shrob/test011/test2.mk b/jack-tests/tests/com/android/jack/shrob/test011/test2.mk index 89a0513..0564389 100644 --- a/jack-tests/tests/com/android/jack/shrob/test011/test2.mk +++ b/jack-tests/tests/com/android/jack/shrob/test011/test2.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := shrob/test011_2 -JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags002 +JACKTEST_ARGS := --config-proguard $(LOCAL_PATH)/proguard.flags002 JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := dx/Tests2.java JACKTEST_JUNIT := com.android.jack.shrob.test011.dx.Tests2 diff --git a/jack-tests/tests/com/android/jack/shrob/test016/test.mk b/jack-tests/tests/com/android/jack/shrob/test016/test.mk index 059a754..dee82f0 100644 --- a/jack-tests/tests/com/android/jack/shrob/test016/test.mk +++ b/jack-tests/tests/com/android/jack/shrob/test016/test.mk @@ -17,8 +17,8 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := shrob/test016 -JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 \ - --proguard-flags $(LOCAL_PATH)/applyMapping.flags +JACKTEST_ARGS := --config-proguard $(LOCAL_PATH)/proguard.flags001 \ + --config-proguard $(LOCAL_PATH)/applyMapping.flags JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := dx/Tests.java JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests diff --git a/jack-tests/tests/com/android/jack/shrob/test025/test.mk b/jack-tests/tests/com/android/jack/shrob/test025/test.mk index 312131e..59c408a 100644 --- a/jack-tests/tests/com/android/jack/shrob/test025/test.mk +++ b/jack-tests/tests/com/android/jack/shrob/test025/test.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := shrob/test025 -JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 +JACKTEST_ARGS := --config-proguard $(LOCAL_PATH)/proguard.flags001 JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := dx/Tests.java JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests diff --git a/jack-tests/tests/com/android/jack/shrob/test030/test.mk b/jack-tests/tests/com/android/jack/shrob/test030/test.mk index 9227a7c..600a974 100644 --- a/jack-tests/tests/com/android/jack/shrob/test030/test.mk +++ b/jack-tests/tests/com/android/jack/shrob/test030/test.mk @@ -17,7 +17,7 @@ LOCAL_PATH:= $(call my-dir) include $(JACK_CLEAR_VARS) JACKTEST_MODULE := shrob/test030 -JACKTEST_ARGS := --proguard-flags $(LOCAL_PATH)/proguard.flags001 --proguard-flags $(LOCAL_PATH)/../dontobfuscate.flags +JACKTEST_ARGS := --config-proguard $(LOCAL_PATH)/proguard.flags001 --config-proguard $(LOCAL_PATH)/../dontobfuscate.flags JACKTEST_WITHJACK_SRC := $(call all-java-files-under, jack) JACKTEST_WITHDX_SRC := dx/Tests.java JACKTEST_JUNIT := com.android.jack.$(subst /,.,$(JACKTEST_MODULE)).dx.Tests |