diff options
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 0402513cb5..a4473f5437 100644 --- a/Android.mk +++ b/Android.mk @@ -380,11 +380,12 @@ LOCAL_REQUIRED_MODULES += libart_fake # * We will never add them if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD = false. # * We will always add them if PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD = true. # * Otherwise, we will add them by default to userdebug and eng builds. -ifneq (false,$(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD)) -ifneq (,$(filter userdebug eng,$(PRODUCT_TARGET_BUILD_VARIANT))) - PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD := true +art_target_include_debug_build := $(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD) +ifneq (false,$(art_target_include_debug_build)) +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) + art_target_include_debug_build := true endif -ifeq (true,$(PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD)) +ifeq (true,$(art_target_include_debug_build)) LOCAL_REQUIRED_MODULES += \ libartd \ libartd-compiler \ |