summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--JavaLibrary.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 4b5fbcd..8337ab2 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -97,6 +97,9 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE := core-libart
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
LOCAL_REQUIRED_MODULES := tzdata
+# Should not be dex-preopted as it isn't really a Dalvik boot jar or a
+# regular java library, but part of the image for ART.
+LOCAL_DEX_PREOPT := false
include $(BUILD_JAVA_LIBRARY)
ifeq ($(LIBCORE_SKIP_TESTS),)
@@ -189,6 +192,9 @@ ifeq ($(WITH_HOST_DALVIK),true)
LOCAL_MODULE := core-libart-hostdex
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
LOCAL_REQUIRED_MODULES := tzdata-host
+ # Should not be dex-preopted as it isn't really a Dalvik boot jar or a
+ # regular java library, but part of the image for ART.
+ LOCAL_DEX_PREOPT := false
include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
# Make the core-tests library.