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

convert java_resources with bp2build

Browse Source 
Test: b build --platforms=//build/bazel/platforms:linux_x86
  //external/jarjar:jarjar-binary and try to use on a jar
Change-Id: Id6f4e6937687fd575360fbacaeda55c41922636e
This commit is contained in:
Sam Delmerico
2022-03-23 20:20:42 +00:00
parent 4d92d831ca
commit 79985819fe
4 changed files with 182 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
java/java_resources.go
View File

@@ -33,8 +33,13 @@ var resourceExcludes = []string{
"**/*~",
}
func ResourceDirsToJarArgs(ctx android.ModuleContext,
resourceDirs, excludeResourceDirs, excludeResourceFiles []string) (args []string, deps android.Paths) {
type resourceDeps struct {
dir android.Path
files android.Paths
}
func ResourceDirsToFiles(ctx android.BaseModuleContext,
resourceDirs, excludeResourceDirs, excludeResourceFiles []string) (deps []resourceDeps) {
var excludeDirs []string
var excludeFiles []string
@@ -55,21 +60,36 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext,
dirs := ctx.Glob(android.PathForSource(ctx, ctx.ModuleDir()).Join(ctx, resourceDir).String(), excludeDirs)
for _, dir := range dirs {
files := ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), excludeFiles)
deps = append(deps, resourceDeps{
dir: dir,
files: files,
})
}
}
return deps
}
func ResourceDirsToJarArgs(ctx android.ModuleContext,
resourceDirs, excludeResourceDirs, excludeResourceFiles []string) (args []string, deps android.Paths) {
resDeps := ResourceDirsToFiles(ctx, resourceDirs, excludeResourceDirs, excludeResourceFiles)
for _, resDep := range resDeps {
dir, files := resDep.dir, resDep.files
if len(files) > 0 {
args = append(args, "-C", dir.String())
deps = append(deps, files...)
if len(files) > 0 {
args = append(args, "-C", dir.String())
for _, f := range files {
path := f.String()
if !strings.HasPrefix(path, dir.String()) {
panic(fmt.Errorf("path %q does not start with %q", path, dir))
}
args = append(args, "-f", pathtools.MatchEscape(path))
for _, f := range files {
path := f.String()
if !strings.HasPrefix(path, dir.String()) {
panic(fmt.Errorf("path %q does not start with %q", path, dir))
}
args = append(args, "-f", pathtools.MatchEscape(path))
}
}
}
return args, deps