diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-04-18 10:08:46 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2019-04-18 14:27:46 -0700 |
| commit | 6128b858854dc926f1f0a98137997ca669c8ff17 (patch) | |
| tree | 8ce3ea2a56772c4477d984a8803ef6915ffdb0e1 /android | |
| parent | 5cd481adde625d56d4c1abb0bb5ef521eb22df7f (diff) | |
| download | build_soong-6128b858854dc926f1f0a98137997ca669c8ff17.tar.gz build_soong-6128b858854dc926f1f0a98137997ca669c8ff17.tar.bz2 build_soong-6128b858854dc926f1f0a98137997ca669c8ff17.zip | |
TARGET_FS_CONFIG_GEN is a list, not a single path
Bug: 130787336
Test: m oemaids_header_gen oemaids_headers passwd group
Test: Set TARGET_FS_CONFIG_GEN to a list of paths
Change-Id: Ic1f7d38239f3f805ca0723c24005d3e18a811870
Merged-In: Ic1f7d38239f3f805ca0723c24005d3e18a811870
(cherry picked from commit 54879d193e6f6f9466fe39cf1aa7984527701a07)
Diffstat (limited to 'android')
| -rw-r--r-- | android/config.go | 2 | ||||
| -rw-r--r-- | android/variable.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/config.go b/android/config.go index b938cb06..39aaa6df 100644 --- a/android/config.go +++ b/android/config.go @@ -1049,6 +1049,6 @@ func (c *config) ProductHiddenAPIStubsTest() []string { return c.productVariables.ProductHiddenAPIStubsTest } -func (c *deviceConfig) TargetFSConfigGen() *string { +func (c *deviceConfig) TargetFSConfigGen() []string { return c.config.productVariables.TargetFSConfigGen } diff --git a/android/variable.go b/android/variable.go index c514ce7a..e643c0eb 100644 --- a/android/variable.go +++ b/android/variable.go @@ -286,7 +286,7 @@ type productVariables struct { ProductHiddenAPIStubsSystem []string `json:",omitempty"` ProductHiddenAPIStubsTest []string `json:",omitempty"` - TargetFSConfigGen *string `json:",omitempty"` + TargetFSConfigGen []string `json:",omitempty"` } func boolPtr(v bool) *bool { |