Merge "Don't build automatic RROs for tests"

core/package_internal.mk

@@ -111,6 +111,7 @@ include $(BUILD_SYSTEM)/support_libraries.mk
 
 # Determine whether auto-RRO is enabled for this package.
 enforce_rro_enabled :=
+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.
 
@@ -130,6 +131,7 @@ ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS)))
   else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
     enforce_rro_enabled := true
   endif
+endif
 
 product_package_overlays := $(strip \
     $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \

core/soong_app_prebuilt.mk

@@ -239,6 +239,7 @@ my_common := COMMON
 include $(BUILD_SYSTEM)/link_type.mk
 endif # !LOCAL_IS_HOST_MODULE
 
+ifeq (,$(filter tests,$(LOCAL_MODULE_TAGS)))
   ifdef LOCAL_SOONG_DEVICE_RRO_DIRS
     $(call append_enforce_rro_sources, \
         $(my_register_name), \
@@ -260,6 +261,7 @@ ifdef LOCAL_SOONG_PRODUCT_RRO_DIRS
         product \
     )
   endif
+endif
 
 ifdef LOCAL_PREBUILT_COVERAGE_ARCHIVE
   my_coverage_dir := $(TARGET_OUT_COVERAGE)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_module_path))