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

Commit 6128b858 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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 54879d19)
parent 5cd481ad

android/config.go

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

}

android/variable.go

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