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

Commit 569835bf authored by Calin Juravle's avatar Calin Juravle Committed by android-build-merger
Browse files

Merge "Rename PRODUCT_USES_ART to PRODUCT_USES_DEFAULT_ART_CONFIG" 

am: c23e0138

Change-Id: Ia5033ac1def98c4f71d03a9760b5072dc62dfe58
parents aa752b26 c23e0138

core/dex_preopt.mk

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ $(foreach my_boot_image_name,$(DEXPREOPT_IMAGE_NAMES),$(eval include $(BUILD_SYS 
# We can do this only if preopt is enabled and if the product uses libart config (which sets the

# default properties for preopting).

ifeq ($(WITH_DEXPREOPT), true)

ifeq ($(PRODUCT_USES_ART), true)

ifeq ($(PRODUCT_USES_DEFAULT_ART_CONFIG), true)



boot_zip := $(PRODUCT_OUT)/boot.zip

bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)
@@ -45,5 +45,5 @@ $(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZI 


$(call dist-for-goals, droidcore, $(boot_zip))



endif  #PRODUCT_USES_ART

endif  #PRODUCT_USES_DEFAULT_ART_CONFIG

endif  #WITH_DEXPREOPT

core/product.mk

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ _product_var_list += PRODUCT_DEX_PREOPT_RESOLVE_STARTUP_STRINGS 
_product_var_list += \

    PRODUCT_USE_PROFILE_FOR_BOOT_IMAGE \

    PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION \

    PRODUCT_USES_ART \

    PRODUCT_USES_DEFAULT_ART_CONFIG \



_product_var_list += PRODUCT_SYSTEM_SERVER_COMPILER_FILTER

# Per-module sanitizer configs

target/product/runtime_libart.mk

+1 −1
Original line number Diff line number Diff line
@@ -96,4 +96,4 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ 
PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \

    ro.iorapd.enable=false



PRODUCT_USES_ART := true
 
PRODUCT_USES_DEFAULT_ART_CONFIG := true