diff options
| author | Ying Wang <wangying@android.com> | 2013-12-18 01:06:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-18 01:06:10 +0000 |
| commit | 057375d783a26d300f4b4c2863481d368f4ade8b (patch) | |
| tree | 01198dbdee031288f9ca8cb0e7d77942c48cc53f /core/product_config.mk | |
| parent | d6ef972aea4e291bcbe5ed3aad357a322acc649a (diff) | |
| parent | 03a06f4158e9eea9152f25286fcf2c30044d4e06 (diff) | |
| download | build-057375d783a26d300f4b4c2863481d368f4ade8b.zip build-057375d783a26d300f4b4c2863481d368f4ade8b.tar.gz build-057375d783a26d300f4b4c2863481d368f4ade8b.tar.bz2 | |
am 03a06f41: am 9507a0fd: am 82c59aef: am 71e8a22e: Merge "Add DEXPREOPT support for ART"
* commit '03a06f4158e9eea9152f25286fcf2c30044d4e06':
Add DEXPREOPT support for ART
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index e381dbe..b3e4c0a 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -266,6 +266,17 @@ $(call clear-var-list, $(_product_var_list)) # Now we can assign to PRODUCT_RUNTIMES PRODUCT_RUNTIMES := $(product_runtimes) product_runtimes := + +PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib=$(DALVIK_VM_LIB) + +ifeq ($(words $(PRODUCT_RUNTIMES)),1) + # If we only have one runtime, we can strip classes.dex by default during dex_preopt + DEX_PREOPT_DEFAULT := true +else + # If we have more than one, we leave the classes.dex alone for post-boot analysis + DEX_PREOPT_DEFAULT := nostripping +endif + ############################################################################# # A list of module names of BOOTCLASSPATH (jar files) |