From a8f7639cb7dee119543ed7db0c219e300c11e951 Mon Sep 17 00:00:00 2001 From: Brian Carlstrom Date: Fri, 6 Dec 2013 11:29:15 -0800 Subject: Do not dexopt core-libart Change-Id: I7571221096abbbc76c564033cd5a1c9f6d8553c4 --- JavaLibrary.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'JavaLibrary.mk') 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. -- cgit v1.1