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

Commit dc017122 authored by Anton Hansson's avatar Anton Hansson
Browse files

Read product/device RRO dirs separately from soong 

This change splits the LOCAL_SOONG_RRO_DIRS into two,
representing RRO dirs that originated from device and
product overlay configs, respectively.

Also plumb the device/product configs in separately.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Iddee1b4d7303b7ecaeced91216ea82fe29123770
parent 08231e17

core/clear_vars.mk

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ LOCAL_SOONG_JACOCO_REPORT_CLASSES_JAR := 
LOCAL_SOONG_LINK_TYPE :=

LOCAL_SOONG_PROGUARD_DICT :=

LOCAL_SOONG_RESOURCE_EXPORT_PACKAGE :=

LOCAL_SOONG_RRO_DIRS :=

LOCAL_SOONG_DEVICE_RRO_DIRS :=

LOCAL_SOONG_PRODUCT_RRO_DIRS :=

LOCAL_SOONG_STATIC_LIBRARY_EXTRA_PACKAGES :=

LOCAL_SOONG_TOC :=

LOCAL_SOONG_UNSTRIPPED_BINARY :=

core/soong_app_prebuilt.mk

+2 −2
Original line number Diff line number Diff line
@@ -159,13 +159,13 @@ my_common := COMMON 
include $(BUILD_SYSTEM)/link_type.mk

endif # !LOCAL_IS_HOST_MODULE



ifdef LOCAL_SOONG_RRO_DIRS

ifneq (,$(LOCAL_SOONG_DEVICE_RRO_DIRS)$(LOCAL_SOONG_PRODUCT_RRO_DIRS))

  $(call append_enforce_rro_sources, \

      $(my_register_name), \

      false, \

      $(LOCAL_FULL_MANIFEST_FILE), \

      $(if $(LOCAL_EXPORT_PACKAGE_RESOURCES),true,false), \

      $(LOCAL_SOONG_RRO_DIRS))

      $(LOCAL_SOONG_DEVICE_RRO_DIRS) $(LOCAL_SOONG_PRODUCT_RRO_DIRS))

endif



SOONG_ALREADY_CONV := $(SOONG_ALREADY_CONV) $(LOCAL_MODULE)

core/soong_config.mk

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ $(call add_json_str, CrossHost, $(HOST_CROSS_OS)) 
$(call add_json_str,  CrossHostArch,                     $(HOST_CROSS_ARCH))

$(call add_json_str,  CrossHostSecondaryArch,            $(HOST_CROSS_2ND_ARCH))



$(call add_json_list, ResourceOverlays,                  $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))

$(call add_json_list, DeviceResourceOverlays,            $(DEVICE_PACKAGE_OVERLAYS))

$(call add_json_list, ProductResourceOverlays,           $(PRODUCT_PACKAGE_OVERLAYS))

$(call add_json_list, EnforceRROTargets,                 $(PRODUCT_ENFORCE_RRO_TARGETS))

$(call add_json_list, EnforceRROExcludedOverlays,        $(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS))