Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa04304 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

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

am: 3c4a9159

Change-Id: Ia352f2354235fae711d37a8f059ec01d2b0d8b5d
parents e66d6878 3c4a9159

android/config.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

}
 
}

android/variable.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 {