diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 4 | ||||
| -rw-r--r-- | java/resources.go | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/java/app.go b/java/app.go index db2f1821..ef576e25 100644 --- a/java/app.go +++ b/java/app.go @@ -207,14 +207,14 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat var aaptDeps android.Paths var hasResources bool for _, d := range resourceDirs { - newDeps := ctx.Glob("app_resources", filepath.Join(d.String(), "**/*"), aaptIgnoreFilenames) + newDeps := ctx.Glob(filepath.Join(d.String(), "**/*"), aaptIgnoreFilenames) aaptDeps = append(aaptDeps, newDeps...) if len(newDeps) > 0 { hasResources = true } } for _, d := range assetDirs { - newDeps := ctx.Glob("app_assets", filepath.Join(d.String(), "**/*"), aaptIgnoreFilenames) + newDeps := ctx.Glob(filepath.Join(d.String(), "**/*"), aaptIgnoreFilenames) aaptDeps = append(aaptDeps, newDeps...) } diff --git a/java/resources.go b/java/resources.go index a4783b87..60dc9349 100644 --- a/java/resources.go +++ b/java/resources.go @@ -17,6 +17,8 @@ package java import ( "path/filepath" + "github.com/google/blueprint/bootstrap" + "android/soong/android" ) @@ -54,13 +56,13 @@ func ResourceDirsToJarSpecs(ctx android.ModuleContext, resourceDirs, excludeDirs continue } resourceDir := android.PathForModuleSrc(ctx, resourceDir) - dirs := ctx.Glob("java_resources", resourceDir.String(), nil) + dirs := ctx.Glob(resourceDir.String(), nil) for _, dir := range dirs { fileListFile := android.ResPathWithName(ctx, dir, "resources.list") depFile := fileListFile.String() + ".d" - glob := filepath.Join(dir.String(), "**/*") - android.GlobRule(ctx, glob, excludes, fileListFile.String(), depFile) + pattern := filepath.Join(dir.String(), "**/*") + bootstrap.GlobFile(ctx, pattern, excludes, fileListFile.String(), depFile) jarSpecs = append(jarSpecs, jarSpec{fileListFile, dir}) } } |