diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-12-11 18:07:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-11 18:07:49 +0000 |
| commit | bd76d7aa50c96650cc17aaa591b7e1936827a0ab (patch) | |
| tree | 806e925a6850a4c46c34007452afeb671fbb0816 /JavaLibrary.mk | |
| parent | f7286f3de4101c264c459b83a91e5eef675482c6 (diff) | |
| parent | a8f7639cb7dee119543ed7db0c219e300c11e951 (diff) | |
| download | libcore-bd76d7aa50c96650cc17aaa591b7e1936827a0ab.zip libcore-bd76d7aa50c96650cc17aaa591b7e1936827a0ab.tar.gz libcore-bd76d7aa50c96650cc17aaa591b7e1936827a0ab.tar.bz2 | |
Merge "Do not dexopt core-libart"
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. |