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

Make MakeVarsContext a PathContext am: 65494b962b am: e5bc0d6253

Browse Source 
am: 1c15057b94

Change-Id: I3521fec124f35017812ed2c3faf9fb7e46f73a3a
This commit is contained in:
Colin Cross
2019-02-07 18:21:45 -08:00
committed by android-build-merger
parent b74157dfb3 1c15057b94
commit 32fd5947ca
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)
}
})