Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
This commit is contained in:
parent
78064b4c69
commit
94978cf495
2 changed files with 4 additions and 0 deletions
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue