diff options
| -rw-r--r-- | core/dex_preopt.mk | 4 | ||||
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | target/product/runtime_libart.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 180edafbbb..32690fef4f 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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 diff --git a/core/product.mk b/core/product.mk index f3c9a980a4..66570e4673 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index a88ba3c8d0..5db32f257c 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -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 |