Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5401c1 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"

parents 91e724d4 2bc19019

core/dex_preopt_libart_boot.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -27,10 +27,7 @@ $(my_2nd_arch_prefix)LIBART_BOOT_IMAGE_FILENAME := /$(DEXPREOPT_BOOT_JAR_DIR)/$( 
# The .oat with symbols

# 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)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)

$(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

# Compile boot.oat as position-independent code if WITH_DEXPREOPT_PIC=true

ifeq (true,$(WITH_DEXPREOPT_PIC))

ifeq (true,$(WITH_DEXPREOPT_PIC))

core/dex_preopt_odex_install.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -33,10 +33,6 @@ endif 
ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code

ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file))) # contains no java code

LOCAL_DEX_PREOPT :=

LOCAL_DEX_PREOPT :=

endif

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

# if WITH_DEXPREOPT_BOOT_IMG_ONLY=true and module is not in boot class path skip

ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY))

ifeq (true,$(WITH_DEXPREOPT_BOOT_IMG_ONLY))

ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)

ifeq ($(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE)),)

core/product.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,6 @@ _product_var_list := \ 
    PRODUCT_VERITY_SIGNING_KEY \

    PRODUCT_VERITY_SIGNING_KEY \

    PRODUCT_SYSTEM_VERITY_PARTITION \

    PRODUCT_SYSTEM_VERITY_PARTITION \

    PRODUCT_VENDOR_VERITY_PARTITION \

    PRODUCT_VENDOR_VERITY_PARTITION \

    PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \

    PRODUCT_DEX_PREOPT_MODULE_CONFIGS \

    PRODUCT_DEX_PREOPT_MODULE_CONFIGS \

    PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

    PRODUCT_DEX_PREOPT_DEFAULT_FLAGS \

    PRODUCT_DEX_PREOPT_BOOT_FLAGS \

    PRODUCT_DEX_PREOPT_BOOT_FLAGS \

core/product_config.mk

+0 −4
Original line number Original line Diff line number Diff line
@@ -413,10 +413,6 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ 
PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \

PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \

    $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS))

    $(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 := \

PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

PRODUCT_DEX_PREOPT_BOOT_FLAGS := \

PRODUCT_DEX_PREOPT_BOOT_FLAGS := \