diff options
| author | Baligh Uddin <baligh@google.com> | 2020-11-20 16:07:47 +0000 |
|---|---|---|
| committer | Adrian DC <radian.dc@gmail.com> | 2020-12-30 19:09:44 +0100 |
| commit | fd08014668e71c5db46eed7bbf1cdf23c0a7a3e0 (patch) | |
| tree | a35a6b0640c24c7cf69307a97ffef933e212434b | |
| parent | dd1d9ba1851d96a8d4f55cd8e983fcee1519d953 (diff) | |
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
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index d4de2e5a18..c31d598fd4 100644 --- a/Android.mk +++ b/Android.mk @@ -293,7 +293,7 @@ include $(CLEAR_VARS) # # The ART APEX module (`com.android.art`) 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 release module, while "eng" build variants 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 @@ -304,7 +304,7 @@ include $(CLEAR_VARS) 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 |