From 40a367141686aaf5413979cd051cccfb5f29e26b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 27 Sep 2017 17:41:35 -0700 Subject: 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 --- java/java.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/java.go') 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 } -- cgit v1.2.3-59-g8ed1b