tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 7bbea4b5: Disable dexpreopt for unbundled build.

Browse source 
* commit '7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
  Disable dexpreopt for unbundled build.
This commit is contained in:
Ying Wang 2011-03-24 03:36:19 -07:00 committed by Android Git Automerger
commit 7c7fbeaf1a
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

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