commit 29dbef28a9fa99d337265de1f054ba418f6bf127
author jeffhao <jeffhao@google.com> Wed May 30 17:09:29 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 30 17:09:29 2012 -0700
tree 16a06f79b5403d6408d49c205c7f4db87b987e03
parent 044958948cd7f0b30657289dddd6ab8392aa077b
parent 50808a37b6a60e0c18f8b5e0573ccf4b9d7eb283

Merge "Fix build to rebuild tests correctly, and disable pre-dexopt." into ics-mr1-plus-art

build/Android.oattest.mk

diff --git a/build/Android.oattest.mk b/build/Android.oattest.mk
index c9540e8..2676360 100644
--- a/build/Android.oattest.mk
+++ b/build/Android.oattest.mk
@@ -31,6 +31,7 @@
   LOCAL_NO_STANDARD_LIBRARIES := true
   LOCAL_MODULE_PATH := $(3)
   LOCAL_DEX_PREOPT_IMAGE := $(TARGET_CORE_IMG_OUT)
+  LOCAL_DEX_PREOPT := false
   include $(BUILD_JAVA_LIBRARY)
   ART_TEST_TARGET_DEX_FILES += $(3)/$$(LOCAL_MODULE).jar
 
@@ -45,9 +46,8 @@
   include $(BUILD_HOST_JAVA_LIBRARY)
   ART_TEST_HOST_DEX_FILES += $$(LOCAL_MODULE_PATH)/$$(LOCAL_MODULE).jar
 endef
-#$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-dex,art-test-dex,$(dir),$(ART_NATIVETEST_OUT))))
-#$(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call build-art-test-dex,oat-test-dex,$(dir),$(ART_TEST_OUT))))
-$(foreach dir,HelloWorld, $(eval $(call build-art-test-dex,oat-test-dex,$(dir),$(ART_TEST_OUT))))
+$(foreach dir,$(TEST_DEX_DIRECTORIES), $(eval $(call build-art-test-dex,art-test-dex,$(dir),$(ART_NATIVETEST_OUT))))
+$(foreach dir,$(TEST_OAT_DIRECTORIES), $(eval $(call build-art-test-dex,oat-test-dex,$(dir),$(ART_TEST_OUT))))
 
 ########################################################################