Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ff702d authored May 17, 2023 by Colin Cross

Don't build automatic RROs for tests

Automatic RROs don't make sense for tests, the tests can't rely on
overlays being installed on product or vendor.  Creating the RROs
causes a race during builds that build both droid and device-tests
goals, as the RROs may be installed to the vendor directory as a
dependency of the device-tests goal before or after the vendor image
is packaged as a dependency of the droid goal.  If the RROs are
installed first and the vendor image is low on space it may result
in an out-of-space error.

Bug: 282885159
Test: Rule to build $OUT/vendor/overlay/SystemUITests__*__auto_generated_rro_vendor.apk no longer exists
Change-Id: I760355ffb1818e91c02a98473312f9f21c149361
Merged-In: I760355ffb1818e91c02a98473312f9f21c149361

parent 78335471

core/package_internal.mk

+18 −16

Original line number	Diff line number	Diff line
		@@ -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

+22 −20

Original line number	Diff line number	Diff line
		@@ -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))