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

Make MakeVarsContext a PathContext

Browse Source 
Expose all of SingletonContext to makeVarsContext, and then export
the subset of it that is used through MakeVarsContext.SingletonContext,
plus what is necessary for PathContext, directly through
MakeVarsContext.

Test: m checkbuild
Change-Id: Ie00f36e577fe110b6fa03b901da489d8547773c6
This commit is contained in:
Colin Cross
2019-02-07 14:25:51 -08:00
parent 7cf14099b7
commit 65494b962b
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/support_libraries.go
View File

@@ -28,9 +28,8 @@ func init() {
func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) {
var supportAars, supportJars []string
sctx := ctx.SingletonContext()
sctx.VisitAllModules(func(module android.Module) {
dir := sctx.ModuleDir(module)
ctx.VisitAllModules(func(module android.Module) {
dir := ctx.ModuleDir(module)
switch {
case strings.HasPrefix(dir, "prebuilts/sdk/current/extras"),
dir == "prebuilts/sdk/current/androidx",
@@ -43,7 +42,7 @@ func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) {
return
}
name := sctx.ModuleName(module)
name := ctx.ModuleName(module)
if strings.HasSuffix(name, "-nodeps") {
return
}
@@ -54,7 +53,7 @@ func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) {
case *Library, *Import:
supportJars = append(supportJars, name)
default:
sctx.ModuleErrorf(module, "unknown module type %t", module)
ctx.ModuleErrorf(module, "unknown module type %t", module)
}
})