Remove jarSpec structure
It's not doing anything anymore, and the next patch will need more
complex jar arguments. Just remove it.
Test: m -j checkbuild
Change-Id: I96d15995e86263ec04fd5c13ab0fd54d8b85c788
diff --git a/java/resources.go b/java/resources.go
index 60dc934..4969d48 100644
--- a/java/resources.go
+++ b/java/resources.go
@@ -40,7 +40,8 @@
return false
}
-func ResourceDirsToJarSpecs(ctx android.ModuleContext, resourceDirs, excludeDirs []string) []jarSpec {
+func ResourceDirsToJarArgs(ctx android.ModuleContext,
+ resourceDirs, excludeDirs []string) (args []string, deps android.Paths) {
var excludes []string
for _, exclude := range excludeDirs {
@@ -49,8 +50,6 @@
excludes = append(excludes, resourceExcludes...)
- var jarSpecs []jarSpec
-
for _, resourceDir := range resourceDirs {
if isStringInSlice(resourceDir, excludeDirs) {
continue
@@ -63,9 +62,12 @@
pattern := filepath.Join(dir.String(), "**/*")
bootstrap.GlobFile(ctx, pattern, excludes, fileListFile.String(), depFile)
- jarSpecs = append(jarSpecs, jarSpec{fileListFile, dir})
+ args = append(args,
+ "-C", dir.String(),
+ "-l", fileListFile.String())
+ deps = append(deps, fileListFile)
}
}
- return jarSpecs
+ return args, deps
}