diff --git a/core/product.mk b/core/product.mk index 34cd21ca6a..ab65ea5978 100644 --- a/core/product.mk +++ b/core/product.mk @@ -130,6 +130,7 @@ _product_var_list := \ VENDOR_PRODUCT_RESTRICT_VENDOR_FILES \ VENDOR_EXCEPTION_MODULES \ VENDOR_EXCEPTION_PATHS \ + PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD \ PRODUCT_ART_USE_READ_BARRIER \ PRODUCT_IOT \ PRODUCT_SYSTEM_HEADROOM \ diff --git a/core/product_config.mk b/core/product_config.mk index 2b2d7b369d..d27bdf30a2 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -408,6 +408,10 @@ $(foreach c,$(PRODUCT_SANITIZER_MODULE_CONFIGS),\ $(eval SANITIZER.$(TARGET_PRODUCT).$(m).CONFIG := $(cf)))) _psmc_modules := +# Whether the product wants to ship libartd. For rules and meaning, see art/Android.mk. +PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD)) + # Make this art variable visible to soong_config.mk. PRODUCT_ART_USE_READ_BARRIER := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ART_USE_READ_BARRIER))