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

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

View file

@ -148,12 +148,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.