diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-12-11 11:01:55 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-12-15 23:17:38 -0800 |
| commit | 7aaf90ed0daa9b025f60dc4d77859aa46ebe33ec (patch) | |
| tree | b13a5637e497539bf065af7e2cb07055071982c4 /JavaLibrary.mk | |
| parent | 62bc43a334b79a8df1c81aed0b96061cf5f9f1d9 (diff) | |
| download | libcore-7aaf90ed0daa9b025f60dc4d77859aa46ebe33ec.zip libcore-7aaf90ed0daa9b025f60dc4d77859aa46ebe33ec.tar.gz libcore-7aaf90ed0daa9b025f60dc4d77859aa46ebe33ec.tar.bz2 | |
Revert "Revert "Do not dexopt core-libart""
This reverts commit 5ce66d51d2c5707789a82bb4b02c8dce94bbaf9c.
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 6 |
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. |