diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-11-20 23:46:31 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-11-20 23:47:10 -0800 |
| commit | 4275765ce375e715ac73c6e5965184404e1f490d (patch) | |
| tree | b6abaa921a7c7a92604734470e10acc7dd79dce5 /JavaLibrary.mk | |
| parent | b87fdb7e43360873ba2f4f4717cc0af42bc5308e (diff) | |
| download | libcore-4275765ce375e715ac73c6e5965184404e1f490d.zip libcore-4275765ce375e715ac73c6e5965184404e1f490d.tar.gz libcore-4275765ce375e715ac73c6e5965184404e1f490d.tar.bz2 | |
Remove prohibition on stripping classes.dex from core-libart for Dalvik/ART dual-boot
Bug: 18364650
Change-Id: I86ad8e627bbc558252b4c2aab520a5bf8639df5a
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index c857390..57a8f82 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -84,9 +84,6 @@ 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),) @@ -165,9 +162,6 @@ LOCAL_MODULE_TAGS := optional 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. |