Merge "Expose TargetFSConfigGen to DeviceConfig from Make"

am: 8235220a82

Change-Id: I86575fdbf340e00d37a2aea2c1f990f0772d2669
This commit is contained in:
Dan Willemsen 2019-04-11 16:42:50 -07:00 committed by android-build-merger
commit a0fcf98136
2 changed files with 6 additions and 0 deletions

View file

@ -1048,3 +1048,7 @@ func (c *config) ProductHiddenAPIStubsSystem() []string {
func (c *config) ProductHiddenAPIStubsTest() []string { func (c *config) ProductHiddenAPIStubsTest() []string {
return c.productVariables.ProductHiddenAPIStubsTest return c.productVariables.ProductHiddenAPIStubsTest
} }
func (c *deviceConfig) TargetFSConfigGen() *string {
return c.config.productVariables.TargetFSConfigGen
}

View file

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