commit 691f5cec3a2bc306c6aeeeba484351a3302229c4
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 05 18:05:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 05 18:05:36 2017 +0000
tree d37f15aeebfe2fa4aec4f4d25394487294f68810
parent 5e19557eb99d75ca37a2fbbfb992c135f080bf0a
parent 831fc713f82b90cb3f5864c9412e6e82a4b8d12d

Merge "Build: Add PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD"

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 34cd21c..ab65ea5 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -130,6 +130,7 @@
     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 \

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 2b2d7b3..d27bdf3 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -408,6 +408,10 @@
     $(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))