Merge "Don't build automatic RROs for tests"

core/package_internal.mk

@@ -111,7 +111,8 @@ include $(BUILD_SYSTEM)/support_libraries.mk
 
 # Determine whether auto-RRO is enabled for this package.
 enforce_rro_enabled :=
-ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
+ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
+  ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
     # * means all system and system_ext APKs, so enable conditionally based on module path.
 
     # Note that base_rules.mk has not yet been included, so it's likely that only
@@ -127,8 +128,9 @@ ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
     else ifneq ($(filter $(TARGET_OUT)/%,$(LOCAL_MODULE_PATH)),)
       enforce_rro_enabled := true
     endif
-else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
+  else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
     enforce_rro_enabled := true
+  endif
 endif
 
 product_package_overlays := $(strip \

core/soong_app_prebuilt.mk

@@ -239,7 +239,8 @@ my_common := COMMON
 include $(BUILD_SYSTEM)/link_type.mk
 endif # !LOCAL_IS_HOST_MODULE
 
-ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
+ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
+  ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
     $(call append_enforce_rro_sources, \
         $(my_register_name), \
         false, \
@@ -248,9 +249,9 @@ ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
         $(LOCAL_SOONG_DEVICE_RRO_DIRS), \
         vendor \
     )
-endif
+  endif
 
-ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
+  ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
     $(call append_enforce_rro_sources, \
         $(my_register_name), \
         false, \
@@ -259,6 +260,7 @@ ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
         $(LOCAL_SOONG_PRODUCT_RRO_DIRS), \
         product \
     )
+  endif
 endif
 
 ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE