Add support for RRO in soong app prebuilts
Let soong pass overlay directories that were not used because
of enforced RROs and use the make rules to convert them to
the auto generated RRO package.
Bug: 69917341
Test: m checkbuild
Change-Id: I9db37e0bf65c19cef91428477713e3d7f1941b83
diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 99bd691..1a96ebf 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -229,6 +229,8 @@
LOCAL_SOONG_HEADER_JAR :=
LOCAL_SOONG_DEX_JAR :=
LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR :=
+LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
+LOCAL_SOONG_RRO_DIRS :=
# '',true
LOCAL_SOURCE_FILES_ALL_GENERATED:=
LOCAL_SRC_FILES:=
diff --git a/core/soong_app_prebuilt.mk b/core/soong_app_prebuilt.mk
index ae0b982..0b8fa4d 100644
--- a/core/soong_app_prebuilt.mk
+++ b/core/soong_app_prebuilt.mk
@@ -64,5 +64,11 @@
include $(BUILD_SYSTEM)/link_type.mk
endif # !LOCAL_IS_HOST_MODULE
-# Built in equivalent to include $(CLEAR_VARS)
-LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=
+ifdef LOCAL_SOONG_RRO_DIRS
+ $(call append_enforce_rro_sources, \
+ $(my_register_name), \
+ false, \
+ $(LOCAL_FULL_MANIFEST_FILE), \
+ $(LOCAL_EXPORT_PACKAGE_RESOURCES), \
+ $(LOCAL_SOONG_RRO_DIRS))
+endif