diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-03-17 23:22:53 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-03-17 23:22:53 -0700 |
| commit | 3bbbe82cfec2d3b03b0b560a3978a8231a9a51d3 (patch) | |
| tree | d7759e47cd2422366e7872ec0071b8cbb59cd4c4 /build | |
| parent | b2793375d42b5d90d9a0111581c4314abe11ca4c (diff) | |
| download | art-3bbbe82cfec2d3b03b0b560a3978a8231a9a51d3.zip art-3bbbe82cfec2d3b03b0b560a3978a8231a9a51d3.tar.gz art-3bbbe82cfec2d3b03b0b560a3978a8231a9a51d3.tar.bz2 | |
Add disabled --instruction-set=X86 for test-art-host-oat
Change-Id: I4e05f5c8a8ac59ef74287626f0d3ec46507870d2
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.oat.mk | 2 | ||||
| -rw-r--r-- | build/Android.oattest.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 4489a77..c9509b7 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -57,7 +57,7 @@ TARGET_CORE_IMG_OUT := $(ART_TEST_OUT)/core.art $(HOST_CORE_IMG_OUT): $(HOST_CORE_DEX_FILES) $(DEX2OAT_DEPENDENCY) @echo "host dex2oat: $@ ($?)" @mkdir -p $(dir $@) - $(hide) $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$(PRELOADED_CLASSES) $(addprefix --dex-file=,$(HOST_CORE_DEX_FILES)) $(addprefix --dex-location=,$(HOST_CORE_DEX_LOCATIONS)) --oat-file=$(HOST_CORE_OAT_OUT) --oat-location=$(HOST_CORE_OAT) --image=$(HOST_CORE_IMG_OUT) --base=$(IMG_HOST_BASE_ADDRESS) + $(hide) $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --image-classes=$(PRELOADED_CLASSES) $(addprefix --dex-file=,$(HOST_CORE_DEX_FILES)) $(addprefix --dex-location=,$(HOST_CORE_DEX_LOCATIONS)) --oat-file=$(HOST_CORE_OAT_OUT) --oat-location=$(HOST_CORE_OAT) --image=$(HOST_CORE_IMG_OUT) --base=$(IMG_HOST_BASE_ADDRESS) # --instruction-set=X86 $(TARGET_CORE_IMG_OUT): $(TARGET_CORE_DEX_FILES) $(DEX2OAT_DEPENDENCY) @echo "target dex2oat: $@ ($?)" diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk index c7617e3..ab10d83 100644 --- a/build/Android.oattest.mk +++ b/build/Android.oattest.mk @@ -67,11 +67,12 @@ test-art-target-oat-$(1): $(ART_TEST_OUT)/oat-test-dex-$(1).jar test-art-target- .PHONY: test-art-host-oat-$(1) test-art-host-oat-$(1): $(ART_TEST_OUT)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) mkdir -p /tmp/android-data/test-art-host-oat-$(1) + $(DEX2OAT) --runtime-arg -Xms16m --runtime-arg -Xmx16m --dex-file=$(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar --oat-file=$(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar.oat # --instruction-set=X86 ANDROID_DATA=/tmp/android-data/test-art-host-oat-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ LD_LIBRARY_PATH=$(HOST_OUT_SHARED_LIBRARIES) \ - oatexecd -Ximage:$(shell pwd)/$(HOST_CORE_IMG_OUT) -classpath $(ART_TEST_OUT)/oat-test-dex-$(1).jar -Djava.library.path=$(ART_TEST_OUT) $(1) $(2) - rm -r /tmp/android-data/test-art-host-oat-$(1) + oatexecd -Ximage:$(shell pwd)/$(HOST_CORE_IMG_OUT) -classpath $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar -Djava.library.path=$(HOST_OUT_SHARED_LIBRARIES) $(1) $(2) + $(hide) rm -r /tmp/android-data/test-art-host-oat-$(1) ART_TEST_TARGET_OAT_TARGETS += test-art-target-oat-$(1) |