summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go
index 82dabfaaa..a0bcbfebc 100644
--- a/java/java.go
+++ b/java/java.go
@@ -426,10 +426,11 @@ func (j *Module) compile(ctx android.ModuleContext) {
jars = append(jars, classes)
}
- resourceJarSpecs := ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs)
- if len(resourceJarSpecs) > 0 {
+ resArgs, resDeps := ResourceDirsToJarArgs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs)
+
+ if len(resArgs) > 0 {
// Combine classes + resources into classes-full-debug.jar
- resourceJar := TransformResourcesToJar(ctx, resourceJarSpecs, extraJarDeps)
+ resourceJar := TransformResourcesToJar(ctx, resArgs, resDeps)
if ctx.Failed() {
return
}