Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" am: 3c4a9159c9

am: 8fa04304e7

Change-Id: I9e2450bfc99d592c2e272cb298fbc53fee112755
This commit is contained in:
Dan Willemsen 2019-04-18 12:53:35 -07:00 committed by android-build-merger
commit 9d1dc04e2d
2 changed files with 2 additions and 2 deletions

View File

@ -1053,6 +1053,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
}

View File

@ -288,7 +288,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 {