diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 21:38:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-16 21:38:41 +0000 |
| commit | 73a730caf566fb778ad36f6d991666c482918d22 (patch) | |
| tree | 668733c12401318fc3b40613a5672ecfe626d560 /core/product_config.mk | |
| parent | 8c5401c1c6a5dfd87c4b0f0edc45810e35b93e40 (diff) | |
| parent | d54520a667e3bd5c9f2abe98573a5de83bcf4872 (diff) | |
| download | build-73a730caf566fb778ad36f6d991666c482918d22.zip build-73a730caf566fb778ad36f6d991666c482918d22.tar.gz build-73a730caf566fb778ad36f6d991666c482918d22.tar.bz2 | |
Merge "Remove libdvm support from the core build system."
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index e5a2e3e..6d35ccb 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -248,36 +248,6 @@ all_product_configs := ############################################################################# -# TODO: Remove this hack once only 1 runtime is left. -# Include the runtime product makefile based on the product's PRODUCT_RUNTIMES -$(call clear-var-list, $(_product_var_list)) - -# Set PRODUCT_RUNTIMES, allowing buildspec to override using OVERRIDE_RUNTIMES -product_runtimes := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RUNTIMES)) -ifneq ($(OVERRIDE_RUNTIMES),) - $(info Overriding PRODUCT_RUNTIMES=$(product_runtimes) with $(OVERRIDE_RUNTIMES)) - product_runtimes := $(OVERRIDE_RUNTIMES) -endif -$(foreach runtime, $(product_runtimes), $(eval include $(SRC_TARGET_DIR)/product/$(runtime).mk)) -$(foreach v, $(_product_var_list), $(if $($(v)),\ - $(eval PRODUCTS.$(INTERNAL_PRODUCT).$(v) += $(sort $($(v)))))) - -$(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.2=$(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) PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS)) |