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

Commit e2a17a5a authored by Liz Kammer's avatar Liz Kammer
Browse files

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
parent e5218b6b

android/csuite_config.go

+7 −13
Original line number Original line Diff line number Diff line
@@ -14,11 +14,6 @@ 




package android

package android





import (

	"fmt"

	"io"

)



func init() {

func init() {

	RegisterModuleType("csuite_config", CSuiteConfigFactory)

	RegisterModuleType("csuite_config", CSuiteConfigFactory)

}

}
@@ -38,22 +33,21 @@ func (me *CSuiteConfig) GenerateAndroidBuildActions(ctx ModuleContext) { 
	me.OutputFilePath = PathForModuleOut(ctx, me.BaseModuleName()).OutputPath

	me.OutputFilePath = PathForModuleOut(ctx, me.BaseModuleName()).OutputPath

}

}





func (me *CSuiteConfig) AndroidMk() AndroidMkData {

func (me *CSuiteConfig) AndroidMkEntries() []AndroidMkEntries {

	androidMkData := AndroidMkData{

	androidMkEntries := AndroidMkEntries{

		Class:      "FAKE",

		Class:      "FAKE",

		Include:    "$(BUILD_SYSTEM)/suite_host_config.mk",

		Include:    "$(BUILD_SYSTEM)/suite_host_config.mk",

		OutputFile: OptionalPathForPath(me.OutputFilePath),

		OutputFile: OptionalPathForPath(me.OutputFilePath),

	}

	}

	androidMkData.Extra = []AndroidMkExtraFunc{

	androidMkEntries.ExtraEntries = []AndroidMkExtraEntriesFunc{

		func(w io.Writer, outputFile Path) {

		func(entries *AndroidMkEntries) {

			if me.properties.Test_config != nil {

			if me.properties.Test_config != nil {

				fmt.Fprintf(w, "LOCAL_TEST_CONFIG := %s\n",

				entries.SetString("LOCAL_TEST_CONFIG", *me.properties.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) {

func InitCSuiteConfigModule(me *CSuiteConfig) {