Fix glob filename overlap
If resources and java files were compiled from the same directory, ctx.Glob could try to create a glob file that had the same name as the directory containing another glob file. Namespace each call to ctx.Glob so they never conflict. Change-Id: I4db73af568a2ff2e708e9db64798073b1ed2ff61
This commit is contained in:
@@ -54,7 +54,7 @@ func ResourceDirsToJarSpecs(ctx common.AndroidModuleContext, resourceDirs, exclu
|
||||
continue
|
||||
}
|
||||
resourceDir := filepath.Join(common.ModuleSrcDir(ctx), resourceDir)
|
||||
dirs := ctx.Glob(resourceDir, nil)
|
||||
dirs := ctx.Glob("java_resources", resourceDir, nil)
|
||||
for _, dir := range dirs {
|
||||
fileListFile := filepath.Join(common.ModuleOutDir(ctx), "res", dir, "resources.list")
|
||||
depFile := fileListFile + ".d"
|
||||
|
Reference in New Issue
Block a user