summaryrefslogtreecommitdiff
path: root/android/csuite_config.go
diff options
context:
space:
mode:
author Liz Kammer <eakammer@google.com> 2020-11-24 13:31:28 -0800
committer Liz Kammer <eakammer@google.com> 2020-11-24 13:41:28 -0800
commite2a17a5a406c5772f39a7c22fe07092989e7707b (patch)
tree0318fd975404f1f3b3a3c88bc7295c910ce1cb8e /android/csuite_config.go
parente5218b6be65ff20832318123d69a6730c02f15d1 (diff)
Convert csuite config to use AndroidMkEntries
This is to facilitate consolidation of compatibility suite logic. Test: m nothing and compare soong Android mk files -- no diffs Change-Id: Ibc60d14fdde93835124e18a5c484bbda496bdb9e
Diffstat (limited to 'android/csuite_config.go')
-rw-r--r--android/csuite_config.go20
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) {