StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove jarSpec structure

Browse Source 
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
This commit is contained in:
Colin Cross
2017-09-27 17:41:35 -07:00
parent d689143f1d
commit 40a3671416
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/java.go
View File

@@ -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
}