diff options
| author | Anton Hansson <hansson@google.com> | 2019-03-18 15:53:16 +0000 |
|---|---|---|
| committer | Anton Hansson <hansson@google.com> | 2019-03-21 11:25:46 +0000 |
| commit | 53c88448fd2497023cd6403a7aa72a3f763f3e3a (patch) | |
| tree | 1300b4096f4c20ba8ac4f67a9dd60554882ff739 /android | |
| parent | 21c81326ff4ee6420e73077ce0f05e3cf5565e29 (diff) | |
| download | soong-53c88448fd2497023cd6403a7aa72a3f763f3e3a.tar.gz | |
Separate device and product overlays
This change adds book-keeping of whether an overlay came from
DEVICE_PACKAGE_OVERLAYS or PRODUCT_PACKAGE_OVERLAYS. This is
later used when writing the output to soong_app_prebuilt.mk, to
use either LOCAL_SOONG_[DEVICE|PRODUCT]_RRO_PACKAGES depending
on the original source.
This change is intended to be a noop on its own, but allows a
follow-up make change to customize the location of the auto-generated
RRO packages.
Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Ib24fe1d05be132c360dd6966f7c83968c9939f77
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 8 | ||||
| -rw-r--r-- | android/variable.go | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/android/config.go b/android/config.go index 7679f2970..fff77ca88 100644 --- a/android/config.go +++ b/android/config.go @@ -475,8 +475,12 @@ func (c *config) DeviceName() string { return *c.productVariables.DeviceName } -func (c *config) ResourceOverlays() []string { - return c.productVariables.ResourceOverlays +func (c *config) DeviceResourceOverlays() []string { + return c.productVariables.DeviceResourceOverlays +} + +func (c *config) ProductResourceOverlays() []string { + return c.productVariables.ProductResourceOverlays } func (c *config) PlatformVersionName() string { diff --git a/android/variable.go b/android/variable.go index 1b33f990a..aa8c80493 100644 --- a/android/variable.go +++ b/android/variable.go @@ -165,7 +165,8 @@ type productVariables struct { CrossHostArch *string `json:",omitempty"` CrossHostSecondaryArch *string `json:",omitempty"` - ResourceOverlays []string `json:",omitempty"` + DeviceResourceOverlays []string `json:",omitempty"` + ProductResourceOverlays []string `json:",omitempty"` EnforceRROTargets []string `json:",omitempty"` EnforceRROExcludedOverlays []string `json:",omitempty"` |