diff options
| author | 2017-09-27 17:41:35 -0700 | |
|---|---|---|
| committer | 2017-09-29 14:02:22 -0700 | |
| commit | 40a367141686aaf5413979cd051cccfb5f29e26b (patch) | |
| tree | 700ab0173e9518fc52a5d98b94eaea1671e584cd /java/java.go | |
| parent | d689143f1db66193e655651d3190206dc9eb4f82 (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
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 } |