StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c8c09e28: Inform dex-preopt when the target device is a uniprocessor.

Browse Source 
Merge commit 'c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp

* commit 'c8c09e285d59f73334267deb9502c0927c616837':
  Inform dex-preopt when the target device is a uniprocessor.
This commit is contained in:
Dan Bornstein
2010-09-29 12:53:24 -07:00
committed by Android Git Automerger
parent 73143d9dfc c8c09e285d
commit a38198a5f4
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/dex_preopt.mk
View File

@@ -17,6 +17,14 @@ DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_BUILD_DIR)/$(DEXPREOPT_PRODUCT_D
DEXPREOPT_BOOT_ODEXS := $(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),\ DEXPREOPT_BOOT_ODEXS := $(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),\
$(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(b).odex) $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(b).odex)
# If the target is a uniprocessor, then explicitly tell the preoptimizer
# that fact. (By default, it always optimizes for an SMP target.)
ifeq ($(TARGET_CPU_SMP),true)
DEXPREOPT_UNIPROCESSOR :=
else
DEXPREOPT_UNIPROCESSOR := --uniprocessor
endif
# $(1): the .jar or .apk to remove classes.dex # $(1): the .jar or .apk to remove classes.dex
define dexpreopt-remove-classes.dex define dexpreopt-remove-classes.dex
$(hide) $(AAPT) remove $(1) classes.dex $(hide) $(AAPT) remove $(1) classes.dex
@@ -27,7 +35,7 @@ endef
define dexpreopt-one-file define dexpreopt-one-file
$(hide) $(DEXPREOPT) --dexopt=$(DEXPREOPT_DEXOPT) --build-dir=$(DEXPREOPT_BUILD_DIR) \ $(hide) $(DEXPREOPT) --dexopt=$(DEXPREOPT_DEXOPT) --build-dir=$(DEXPREOPT_BUILD_DIR) \
--product-dir=$(DEXPREOPT_PRODUCT_DIR) --boot-dir=$(DEXPREOPT_BOOT_JAR_DIR) \ --product-dir=$(DEXPREOPT_PRODUCT_DIR) --boot-dir=$(DEXPREOPT_BOOT_JAR_DIR) \
--boot-jars=$(DEXPREOPT_BOOT_JARS) \ --boot-jars=$(DEXPREOPT_BOOT_JARS) $(DEXPREOPT_UNIPROCESSOR) \
$(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(1)) \ $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(1)) \
$(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(2)) $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(2))
endef endef