summaryrefslogtreecommitdiff
path: root/java/java_resources.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-05-07 07:36:39 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-07 07:36:39 -0700
commit04c69f1c9d1ba250a936fbbcc9dc9b6c63bc5800 (patch)
tree6c7d272a67c90d49b9c94d6fecb127763b389bbf /java/java_resources.go
parent29ae56ede9936db1d263eb90dbf9da9af0017651 (diff)
parentda2bba1d710d4e84a075a9e14ddded4bf53f401f (diff)
Merge "Allow module types to generate resources"
am: da2bba1d71 Change-Id: I0ad142dadec08bd50ab8fdaa1f6dada0bf24a069
Diffstat (limited to 'java/java_resources.go')
-rw-r--r--java/java_resources.go10
1 files changed, 9 insertions, 1 deletions
diff --git a/java/java_resources.go b/java/java_resources.go
index 71611689a..1bbeb9a6c 100644
--- a/java/java_resources.go
+++ b/java/java_resources.go
@@ -98,6 +98,14 @@ func resourceFilesToJarArgs(ctx android.ModuleContext,
files := android.PathsForModuleSrcExcludes(ctx, res, exclude)
+ args = resourcePathsToJarArgs(files)
+
+ return args, files
+}
+
+func resourcePathsToJarArgs(files android.Paths) []string {
+ var args []string
+
lastDir := ""
for i, f := range files {
rel := f.Rel()
@@ -113,5 +121,5 @@ func resourceFilesToJarArgs(ctx android.ModuleContext,
lastDir = dir
}
- return args, files
+ return args
}