Add EarlyModuleContext for LoadHookContext

Make LoadHookContext embed a new EarlyModuleContext instead of
BaseModuleContext to reduce its API surface in preparation for
moving it to run during parsing instead of mutators.

Test: m checkbuild
Change-Id: I1cd3ff3b636e7e24991a9184d7521903473e505a
This commit is contained in:
Colin Cross
2019-12-30 18:43:07 -08:00
parent c481607536
commit 1184b647d5
7 changed files with 199 additions and 130 deletions

View File

@@ -286,7 +286,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: socSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: socSpecificModule,
},
},
},
in: []string{"bin", "my_test"},
@@ -298,7 +300,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: deviceSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: deviceSpecificModule,
},
},
},
in: []string{"bin", "my_test"},
@@ -310,7 +314,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: productSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: productSpecificModule,
},
},
},
in: []string{"bin", "my_test"},
@@ -322,7 +328,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: systemExtSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: systemExtSpecificModule,
},
},
},
in: []string{"bin", "my_test"},
@@ -384,7 +392,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: socSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: socSpecificModule,
},
},
inData: true,
},
@@ -397,7 +407,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: deviceSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: deviceSpecificModule,
},
},
inData: true,
},
@@ -410,7 +422,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: productSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: productSpecificModule,
},
},
inData: true,
},
@@ -424,7 +438,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: systemExtSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: systemExtSpecificModule,
},
},
inData: true,
},
@@ -450,7 +466,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: socSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: socSpecificModule,
},
},
inSanitizerDir: true,
},
@@ -463,7 +481,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: deviceSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: deviceSpecificModule,
},
},
inSanitizerDir: true,
},
@@ -476,7 +496,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: productSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: productSpecificModule,
},
},
inSanitizerDir: true,
},
@@ -490,7 +512,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: systemExtSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: systemExtSpecificModule,
},
},
inSanitizerDir: true,
},
@@ -517,7 +541,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: socSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: socSpecificModule,
},
},
inData: true,
inSanitizerDir: true,
@@ -531,7 +557,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: deviceSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: deviceSpecificModule,
},
},
inData: true,
inSanitizerDir: true,
@@ -545,7 +573,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: productSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: productSpecificModule,
},
},
inData: true,
inSanitizerDir: true,
@@ -559,7 +589,9 @@ func TestPathForModuleInstall(t *testing.T) {
baseModuleContext: baseModuleContext{
os: deviceTarget.Os,
target: deviceTarget,
kind: systemExtSpecificModule,
earlyModuleContext: earlyModuleContext{
kind: systemExtSpecificModule,
},
},
inData: true,
inSanitizerDir: true,