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

Commit 8c5ef241 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 44e363f1

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ LOCAL_SHARED_LIBRARIES:= 
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:=

core/soong_app_prebuilt.mk

+8 −2
Original line number Diff line number Diff line
@@ -64,5 +64,11 @@ my_common := COMMON 
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