xsdc: Make Java output name unique
Prefix xsdcgen.srcjar output with package name. This allows
having multiple xsdc_config modules as dependencies.
Test: run errorprone build for aosp/1193648
Change-Id: I3f4e768f8aa1d864ce2290b6edb87c6606525859
diff --git a/build/xsdc.go b/build/xsdc.go
index 37f0440..0546ec4 100644
--- a/build/xsdc.go
+++ b/build/xsdc.go
@@ -157,8 +157,9 @@
xsdFile := srcFiles[0]
pkgName := *module.properties.Package_name
+ filenameStem := strings.Replace(pkgName, ".", "_", -1)
- module.genOutputs_j = android.PathForModuleGen(ctx, "java", "xsdcgen.srcjar")
+ module.genOutputs_j = android.PathForModuleGen(ctx, "java", filenameStem+"_xsdcgen.srcjar")
ctx.Build(pctx, android.BuildParams{
Rule: xsdcJavaRule,
@@ -171,7 +172,6 @@
},
})
- filenameStem := strings.Replace(pkgName, ".", "_", -1)
module.genOutputs_c = android.PathForModuleGen(ctx, "cpp", filenameStem+".cpp")
module.genOutputs_h = android.PathForModuleGen(ctx, "cpp", "include/"+filenameStem+".h")
module.genOutputDir = android.PathForModuleGen(ctx, "cpp", "include")