commit 0ac92aa590654850397b31ea9cdd78b1ca28aaca
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 17 02:06:49 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 02:06:49 2020 +0000
tree 2a19f1d96bd87c098792e3d4380fe6e963749af1
parent 735283a2e59845a69066b73e1663ae45e5db3b5c
parent 0821189f2f6ed2c4d17a9c6ad61ee2d66c35bcd0

Merge "Support empty enumeration value"

build/xsdc.go

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")