StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidate baseContext, BaseContext, and BaseModuleContext

Browse Source 
blueprint.BaseModuleContext is the set of methods available to all
module-specific calls (GenerateBuildActions or mutators).  The
android package split the same functionality across baseContext (nee
androidBaseContext), BaseModuleContext, and BaseContext.
Consolidate all of them into android.BaseModuleContext.

Test: m checkbuild
Change-Id: I2d7f5c56fd4424032cb93edff6dc730ff33e4f1e
This commit is contained in:
Colin Cross
2019-06-06 14:33:29 -07:00
parent 4157e88427
commit 0ea8ba82fc
13 changed files with 115 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
android/paths_test.go
View File

@@ -200,7 +200,7 @@ func p(in interface{}) string {
}
type moduleInstallPathContextImpl struct {
baseContextImpl
baseModuleContext
inData bool
inSanitizerDir bool
@@ -212,7 +212,7 @@ func (moduleInstallPathContextImpl) Fs() pathtools.FileSystem {
}
func (m moduleInstallPathContextImpl) Config() Config {
return m.baseContextImpl.config
return m.baseModuleContext.config
}
func (moduleInstallPathContextImpl) AddNinjaFileDeps(deps ...string) {}
@@ -244,7 +244,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "host binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: hostTarget,
},
},
@@ -255,7 +255,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "system binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
},
},
@@ -265,7 +265,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "vendor binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: socSpecificModule,
},
@@ -276,7 +276,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "odm binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: deviceSpecificModule,
},
@@ -287,7 +287,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "product binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productSpecificModule,
},
@@ -298,7 +298,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "product_services binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productServicesSpecificModule,
},
@@ -310,7 +310,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "system native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
},
inData: true,
@@ -321,7 +321,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "vendor native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: socSpecificModule,
},
@@ -333,7 +333,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "odm native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: deviceSpecificModule,
},
@@ -345,7 +345,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "product native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productSpecificModule,
},
@@ -358,7 +358,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "product_services native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productServicesSpecificModule,
},
@@ -371,7 +371,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized system binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
},
inSanitizerDir: true,
@@ -382,7 +382,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized vendor binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: socSpecificModule,
},
@@ -394,7 +394,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized odm binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: deviceSpecificModule,
},
@@ -406,7 +406,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized product binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productSpecificModule,
},
@@ -419,7 +419,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized product_services binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productServicesSpecificModule,
},
@@ -432,7 +432,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized system native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
},
inData: true,
@@ -444,7 +444,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized vendor native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: socSpecificModule,
},
@@ -457,7 +457,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized odm native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: deviceSpecificModule,
},
@@ -470,7 +470,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized product native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productSpecificModule,
},
@@ -483,7 +483,7 @@ func TestPathForModuleInstall(t *testing.T) {
{
name: "sanitized product_services native test binary",
ctx: &moduleInstallPathContextImpl{
baseContextImpl: baseContextImpl{
baseModuleContext: baseModuleContext{
target: deviceTarget,
kind: productServicesSpecificModule,
},
@@ -497,7 +497,7 @@ func TestPathForModuleInstall(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
tc.ctx.baseContextImpl.config = testConfig
tc.ctx.baseModuleContext.config = testConfig
output := PathForModuleInstall(tc.ctx, tc.in...)
if output.basePath.path != tc.out {
t.Errorf("unexpected path:\n got: %q\nwant: %q\n",