StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TARGET_FS_CONFIG_GEN is a list, not a single path"

Browse Source 
am: 3c4a9159c9

Change-Id: Ia352f2354235fae711d37a8f059ec01d2b0d8b5d
This commit is contained in:
Dan Willemsen
2019-04-18 12:48:20 -07:00
committed by android-build-merger
parent e66d6878a4 3c4a9159c9
commit 8fa04304e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/config.go
View File

@@ -1053,6 +1053,6 @@ func (c *config) ProductHiddenAPIStubsTest() []string {
return c.productVariables.ProductHiddenAPIStubsTest return c.productVariables.ProductHiddenAPIStubsTest
} }
func (c *deviceConfig) TargetFSConfigGen() *string { func (c *deviceConfig) TargetFSConfigGen() []string {
return c.config.productVariables.TargetFSConfigGen return c.config.productVariables.TargetFSConfigGen
} }

2
android/variable.go
View File

@@ -288,7 +288,7 @@ type productVariables struct {
ProductHiddenAPIStubsSystem []string `json:",omitempty"` ProductHiddenAPIStubsSystem []string `json:",omitempty"`
ProductHiddenAPIStubsTest []string `json:",omitempty"` ProductHiddenAPIStubsTest []string `json:",omitempty"`
TargetFSConfigGen *string `json:",omitempty"` TargetFSConfigGen []string `json:",omitempty"`
} }
func boolPtr(v bool) *bool { func boolPtr(v bool) *bool {