Use the non-debug apex for userdebug builds
Userdebug device builds are providing a debug ART module
(com.android.art.debug), which prevents the override_apex()
soong function to properly override com.android.art module,
leading to multiple art modules on a device image.
BUG: 173331738
BUG: 173662703
Test: TH
Merged-In: I0cdc4b43bd56156ba5f0bcbafec77701dede2bb0
Change-Id: Ic9b3d470b86500b5acb70540c0ac2bdb83e775dc
diff --git a/Android.mk b/Android.mk
index 9f78cc9..d224681 100644
--- a/Android.mk
+++ b/Android.mk
@@ -297,7 +297,7 @@
#
# `com.android.art-autoselect` is an "alias" for either the release or the debug
# module. By default, "user" build variants contain the release module, while
-# "userdebug" and "eng" build variants contain the debug module. However, if
+# "eng" build variant contain the debug module. However, if
# `PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD` is defined, it overrides the previous
# logic:
# - if `PRODUCT_ART_TARGET_INCLUDE_DEBUG_BUILD` is set to `false`, the
@@ -308,7 +308,7 @@
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)))
+ ifneq (,$(filter eng,$(TARGET_BUILD_VARIANT)))
art_target_include_debug_build := true
endif
endif
