diff options
| author | Liz Kammer <eakammer@google.com> | 2020-11-24 13:31:28 -0800 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2020-12-04 15:43:40 +0000 |
| commit | 176d99de10f098ebcf98b27d609d325b6a02b36c (patch) | |
| tree | 011e10bea42dd3e3c5816b3100a11bc48502c332 | |
| parent | a3f4ee51d5cef973a8b6f4bfbdf3589f1ba545c4 (diff) | |
| download | soong-176d99de10f098ebcf98b27d609d325b6a02b36c.tar.gz | |
Convert csuite config to use AndroidMkEntries
This is to facilitate consolidation of compatibility suite logic.
Bug: 170318013
Test: m nothing and compare soong Android mk files -- no diffs
(cherry picked from commit Ibc60d14fdde93835124e18a5c484bbda496bdb9e)
Merged-In: Ibc60d14fdde93835124e18a5c484bbda496bdb9e
Change-Id: I58ea67972d08e5b17c447e35be942f61268489e4
| -rw-r--r-- | android/csuite_config.go | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/android/csuite_config.go b/android/csuite_config.go index 15c518a07..a5b15331a 100644 --- a/android/csuite_config.go +++ b/android/csuite_config.go @@ -14,11 +14,6 @@ package android -import ( - "fmt" - "io" -) - func init() { RegisterModuleType("csuite_config", CSuiteConfigFactory) } @@ -38,22 +33,21 @@ func (me *CSuiteConfig) GenerateAndroidBuildActions(ctx ModuleContext) { me.OutputFilePath = PathForModuleOut(ctx, me.BaseModuleName()).OutputPath } -func (me *CSuiteConfig) AndroidMk() AndroidMkData { - androidMkData := AndroidMkData{ +func (me *CSuiteConfig) AndroidMkEntries() []AndroidMkEntries { + androidMkEntries := AndroidMkEntries{ Class: "FAKE", Include: "$(BUILD_SYSTEM)/suite_host_config.mk", OutputFile: OptionalPathForPath(me.OutputFilePath), } - androidMkData.Extra = []AndroidMkExtraFunc{ - func(w io.Writer, outputFile Path) { + androidMkEntries.ExtraEntries = []AndroidMkExtraEntriesFunc{ + func(entries *AndroidMkEntries) { if me.properties.Test_config != nil { - fmt.Fprintf(w, "LOCAL_TEST_CONFIG := %s\n", - *me.properties.Test_config) + entries.SetString("LOCAL_TEST_CONFIG", *me.properties.Test_config) } - fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE := csuite") + entries.AddStrings("LOCAL_COMPATIBILITY_SUITE", "csuite") }, } - return androidMkData + return []AndroidMkEntries{androidMkEntries} } func InitCSuiteConfigModule(me *CSuiteConfig) { |