commit 76c8e59f015fd898ee244e9dff6e2000660b7b22
author Brian Carlstrom <bdc@google.com> Mon Jan 27 22:56:32 2014 -0800
committer Brian Carlstrom <bdc@google.com> Mon Jan 27 22:56:32 2014 -0800
tree 23a7890565a729763f11fff41188e4e8e9af8011
parent 7ea5dafc81b2bba7cabad26130bb75dc8f709803

Disable LOCAL_DEX_PREOPT for non-default LOCAL_DEX_PREOPT_IMAGE

Change-Id: Id5634250422138195218463e731b2d3772cba48f

test/Android.mk

diff --git a/test/Android.mk b/test/Android.mk
index 27834f0..d716f9b 100644
--- a/test/Android.mk
+++ b/test/Android.mk
@@ -71,6 +71,7 @@
     LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_MODULE_PATH := $(3)
     LOCAL_DEX_PREOPT_IMAGE := $(TARGET_CORE_IMG_OUT)
+    LOCAL_DEX_PREOPT := false
     LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
     LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
     include $(BUILD_JAVA_LIBRARY)
@@ -84,6 +85,7 @@
     LOCAL_JAVA_LIBRARIES := $(HOST_CORE_JARS)
     LOCAL_NO_STANDARD_LIBRARIES := true
     LOCAL_DEX_PREOPT_IMAGE := $(HOST_CORE_IMG_OUT)
+    LOCAL_DEX_PREOPT := false
     LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk
     LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk
     include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)