diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-19 16:09:42 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-19 18:51:34 -0700 |
| commit | f662e0600ae0e0a1a5f732dc3aae25679ffa102f (patch) | |
| tree | 23ebc5172ea4290382220e97dc6fcf16ece5587a /test | |
| parent | 6b522855f913617e00c1783264436145d00cc533 (diff) | |
| download | android_art-f662e0600ae0e0a1a5f732dc3aae25679ffa102f.tar.gz android_art-f662e0600ae0e0a1a5f732dc3aae25679ffa102f.tar.bz2 android_art-f662e0600ae0e0a1a5f732dc3aae25679ffa102f.zip | |
Updating clean-oat again
Also fix test-art-host-oat dex2oat'ing to use the proper new directory layout.
Change-Id: I4a65e88910a72dbe342c814551e4364d73e26e9c
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/Android.mk b/test/Android.mk index a3aabe67ca..0684c90564 100644 --- a/test/Android.mk +++ b/test/Android.mk @@ -134,11 +134,11 @@ test-art-target-oat-$(1): test-art-target-oat-$(1)$(ART_PHONY_TEST_TARGET_SUFFIX endif $(call declare-test-art-oat-targets-impl,$(1),) -$(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex: $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) | $(DEX2OATD) - $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_LOCATION) --dex-file=$$(realpath $$<) --oat-file=$$(realpath $(HOST_OUT_JAVA_LIBRARIES))/oat-test-dex-$(1).odex --instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT) +$(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex: $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).jar $(HOST_CORE_IMG_OUT) | $(DEX2OATD) + $(DEX2OATD) $(DEX2OAT_FLAGS) --runtime-arg -Xms16m --runtime-arg -Xmx16m --boot-image=$(HOST_CORE_IMG_LOCATION) --dex-file=$$(realpath $$<) --oat-file=$$@ --instruction-set=$(ART_HOST_ARCH) --host --android-root=$(HOST_OUT) .PHONY: test-art-host-oat-default-$(1) -test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies +test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex test-art-host-dependencies mkdir -p /tmp/android-data/test-art-host-oat-default-$(1) ANDROID_DATA=/tmp/android-data/test-art-host-oat-default-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ @@ -148,7 +148,7 @@ test-art-host-oat-default-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).ode $(hide) rm -r /tmp/android-data/test-art-host-oat-default-$(1) .PHONY: test-art-host-oat-interpreter-$(1) -test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/oat-test-dex-$(1).odex test-art-host-dependencies +test-art-host-oat-interpreter-$(1): $(HOST_OUT_JAVA_LIBRARIES)/$(ART_HOST_ARCH)/oat-test-dex-$(1).odex test-art-host-dependencies mkdir -p /tmp/android-data/test-art-host-oat-interpreter-$(1) ANDROID_DATA=/tmp/android-data/test-art-host-oat-interpreter-$(1) \ ANDROID_ROOT=$(HOST_OUT) \ |