diff options
author | Dan Willemsen | 2019-04-10 14:27:35 -0500 |
---|---|---|
committer | Dan Willemsen | 2019-04-10 22:24:16 -0500 |
commit | 71c74607133b017c874340c0cce6892a14733b50 (patch) | |
tree | 7270f4ce257eea5b06fc2de39cd203cff6024548 /android | |
parent | 33055f641aebc332b3c68b50ef40ee2b8ed6b74b (diff) | |
download | platform-build-soong-71c74607133b017c874340c0cce6892a14733b50.tar.gz platform-build-soong-71c74607133b017c874340c0cce6892a14733b50.tar.xz platform-build-soong-71c74607133b017c874340c0cce6892a14733b50.zip |
Expose TargetFSConfigGen to DeviceConfig from Make
Bug: 118089258
Test: m oemaids_header_gen oemaids_headers
Change-Id: I2675822ae01af9bbec70f0c0413c047f36b5e024
Diffstat (limited to 'android')
-rw-r--r-- | android/config.go | 4 | ||||
-rw-r--r-- | android/variable.go | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/android/config.go b/android/config.go index 0c9f9576..ed05c726 100644 --- a/android/config.go +++ b/android/config.go | |||
@@ -1048,3 +1048,7 @@ func (c *config) ProductHiddenAPIStubsSystem() []string { | |||
1048 | func (c *config) ProductHiddenAPIStubsTest() []string { | 1048 | func (c *config) ProductHiddenAPIStubsTest() []string { |
1049 | return c.productVariables.ProductHiddenAPIStubsTest | 1049 | return c.productVariables.ProductHiddenAPIStubsTest |
1050 | } | 1050 | } |
1051 | |||
1052 | func (c *deviceConfig) TargetFSConfigGen() *string { | ||
1053 | return c.config.productVariables.TargetFSConfigGen | ||
1054 | } | ||
diff --git a/android/variable.go b/android/variable.go index 16d7b138..666f29f8 100644 --- a/android/variable.go +++ b/android/variable.go | |||
@@ -287,6 +287,8 @@ type productVariables struct { | |||
287 | ProductHiddenAPIStubs []string `json:",omitempty"` | 287 | ProductHiddenAPIStubs []string `json:",omitempty"` |
288 | ProductHiddenAPIStubsSystem []string `json:",omitempty"` | 288 | ProductHiddenAPIStubsSystem []string `json:",omitempty"` |
289 | ProductHiddenAPIStubsTest []string `json:",omitempty"` | 289 | ProductHiddenAPIStubsTest []string `json:",omitempty"` |
290 | |||
291 | TargetFSConfigGen *string `json:",omitempty"` | ||
290 | } | 292 | } |
291 | 293 | ||
292 | func boolPtr(v bool) *bool { | 294 | func boolPtr(v bool) *bool { |