openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Disable dexpreopt for unbundled build. 

Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
This commit is contained in:
Ying Wang 2011-01-12 11:12:06 -08:00
parent 78064b4c69
commit 94978cf495
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) LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar)
ifeq (true,$(WITH_DEXPREOPT)) ifeq (true,$(WITH_DEXPREOPT))
ifeq (,$(TARGET_BUILD_APPS))
ifndef LOCAL_DEX_PREOPT ifndef LOCAL_DEX_PREOPT
LOCAL_DEX_PREOPT := true LOCAL_DEX_PREOPT := true
endif endif
endif endif
endif
################################# #################################
include $(BUILD_SYSTEM)/java.mk include $(BUILD_SYSTEM)/java.mk

2
core/package.mk
View File

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