p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable dexpreopt for unbundled build. 

Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
This commit is contained in:
Ying Wang 2011-01-12 11:12:06 -08:00
parent 3fd580d4e2
commit 7bbea4b5c1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/java_library.mk
View File

@ -30,10 +30,12 @@ common_javalib.jar := $(intermediates.COMMON)/$(LOCAL_BUILT_MODULE_STEM)
LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar)
ifeq (true,$(WITH_DEXPREOPT))
ifeq (,$(TARGET_BUILD_APPS))
ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true
endif
endif
endif
#################################
include $(BUILD_SYSTEM)/java.mk

2
core/package.mk
View File

@ -155,12 +155,14 @@ endif # !custom
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
ifeq (true,$(WITH_DEXPREOPT))
ifeq (,$(TARGET_BUILD_APPS))
ifneq (,$(LOCAL_SRC_FILES))
ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true
endif
endif
endif
endif
# The dex files go in the package, so we don't
# want to install them separately for this module.