diff options
| author | 2017-07-06 15:43:12 -0700 | |
|---|---|---|
| committer | 2017-07-06 15:43:12 -0700 | |
| commit | 5ed27bc3b85c96a446a71b379a72a4559e06fc0c (patch) | |
| tree | 1992601efdce1c334d4c2bb163fcf5a597b5d0d3 | |
| parent | 7b46197bc2459b3324e0049277a911e31414bb52 (diff) | |
ART: Fix the debug-build inclusion
Should be TARGET_BUILD_VARIANT.
Bug: 62087184
Test: m
Change-Id: Ia386ba1f883bbd22cd867e054882410c263b373c
| -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 \ |