diff options
| author | Anton Hansson <hansson@google.com> | 2019-03-21 04:46:05 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-21 04:46:05 -0700 |
| commit | b56333c19b3b69053598a71f0b29d91e9d87b423 (patch) | |
| tree | 11e9e60ac9d0f76d1b7323c31e54dce4f54c0e7a /android | |
| parent | 6964c93121262be217f3c598bea99397856be86a (diff) | |
| parent | 40286c75e4468f7b8714a51fdf70dfba0e611f3a (diff) | |
| download | build_soong-b56333c19b3b69053598a71f0b29d91e9d87b423.tar.gz build_soong-b56333c19b3b69053598a71f0b29d91e9d87b423.tar.bz2 build_soong-b56333c19b3b69053598a71f0b29d91e9d87b423.zip | |
Separate device and product overlays am: 53c88448fd am: d24adcf68e
am: 40286c75e4
Change-Id: I1e6ae2fe7f5cc57271edce235b702b83b64a7902
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 7679f297..fff77ca8 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 1b33f990..aa8c8049 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"` |