diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-12-15 22:09:58 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-12-15 22:09:58 -0800 |
| commit | 2bc19019e5e4801fe7743e30745c9b183ff3d839 (patch) | |
| tree | 3688786eb8be9a8a29a6b7667c2c290189e72496 | |
| parent | 91e724d42f921dd35943cdc89e8f4c4362da691a (diff) | |
| download | build-2bc19019e5e4801fe7743e30745c9b183ff3d839.zip build-2bc19019e5e4801fe7743e30745c9b183ff3d839.tar.gz build-2bc19019e5e4801fe7743e30745c9b183ff3d839.tar.bz2 | |
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Bug: 18673991
Change-Id: I64261ef6a37df92eeef8552b8fd0a67157e4a034
| -rw-r--r-- | core/dex_preopt_libart_boot.mk | 3 | ||||
| -rw-r--r-- | core/dex_preopt_odex_install.mk | 4 | ||||
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | core/product_config.mk | 4 |
4 files changed, 0 insertions, 12 deletions
diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index 826075f..2569d73 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -27,10 +27,7 @@ $(my_2nd_arch_prefix)LIBART_BOOT_IMAGE_FILENAME := /$(DEXPREOPT_BOOT_JAR_DIR)/$( # The .oat with symbols $(my_2nd_arch_prefix)LIBART_TARGET_BOOT_OAT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)$(patsubst %.art,%.oat,$($(my_2nd_arch_prefix)LIBART_BOOT_IMAGE_FILENAME)) -$(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := -ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true) $(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := $(PRODUCT_OUT)$($(my_2nd_arch_prefix)LIBART_BOOT_IMAGE_FILENAME) -endif # Compile boot.oat as position-independent code if WITH_DEXPREOPT_PIC=true ifeq (true,$(WITH_DEXPREOPT_PIC)) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index cb38261..20bbe78 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -33,10 +33,6 @@ endif ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code LOCAL_DEX_PREOPT := endif -# if module oat file requested in data, disable LOCAL_DEX_PREOPT, will default location to dalvik-cache -ifneq (,$(filter $(LOCAL_MODULE),$(PRODUCT_DEX_PREOPT_PACKAGES_IN_DATA))) -LOCAL_DEX_PREOPT := -endif # if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY)) ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),) diff --git a/core/product.mk b/core/product.mk index a7a1fb2..5f91551 100644 --- a/core/product.mk +++ b/core/product.mk @@ -107,7 +107,6 @@ _product_var_list := \ PRODUCT_VERITY_SIGNING_KEY \ PRODUCT_SYSTEM_VERITY_PARTITION \ PRODUCT_VENDOR_VERITY_PARTITION \ - PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \ PRODUCT_DEX_PREOPT_MODULE_CONFIGS \ PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ diff --git a/core/product_config.mk b/core/product_config.mk index d4ba364..e5a2e3e 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -413,10 +413,6 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) -# If there is no room in /system for the image, place it in /data -PRODUCT_DEX_PREOPT_IMAGE_IN_DATA := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_IMAGE_IN_DATA)) - PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS)) PRODUCT_DEX_PREOPT_BOOT_FLAGS := \ |