commit dc017122fbd3304d5cbbdc274f4e9b477aebfb13
author Anton Hansson <hansson@google.com> Mon Mar 18 17:59:27 2019 +0000
committer Anton Hansson <hansson@google.com> Mon Mar 18 19:39:51 2019 +0000
tree 2f9d62c4b359ba36f537938b179c20c71a3fb614
parent 08231e17863e617539a3857c160764fd8e6c2237

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

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index 3c82e88..ddc8cf3 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -61,7 +61,8 @@
 $(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))