commit 54879d193e6f6f9466fe39cf1aa7984527701a07
author Dan Willemsen <dwillemsen@google.com> Thu Apr 18 10:08:46 2019 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Apr 18 17:16:41 2019 +0000
tree 67e90aaff15135a27d3e35b5b8d9c840c8c86144
parent cd9a1e2e73fe9fe2e9c9e956625d26d9431fa83b

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

android/config.go

diff --git a/android/config.go b/android/config.go
index 0191e38..3af448d 100644
--- a/android/config.go
+++ b/android/config.go
@@ -1053,6 +1053,6 @@
 	return c.productVariables.ProductHiddenAPIStubsTest
 }
 
-func (c *deviceConfig) TargetFSConfigGen() *string {
+func (c *deviceConfig) TargetFSConfigGen() []string {
 	return c.config.productVariables.TargetFSConfigGen
 }

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 666f29f..f3da66d 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -288,7 +288,7 @@
 	ProductHiddenAPIStubsSystem []string `json:",omitempty"`
 	ProductHiddenAPIStubsTest   []string `json:",omitempty"`
 
-	TargetFSConfigGen *string `json:",omitempty"`
+	TargetFSConfigGen []string `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {