fix handling package_name for C++
When package_name contains "_" (for versioning),
xsdc handles it incorrectly by dividing "_" also.
Normally package name "a.b.c" maps to "a::b::c" namespaces in C++.
Bug: 143743643
Test: manually add generated_sources/headers to audio_effects_conf
which has package_name: "audio.effects.V5_0"
and check the generated source has namespace "audio::effects::V5_0"
Change-Id: I066239edbec7bc343d844e7f05b088b745865986
diff --git a/build/xsdc.go b/build/xsdc.go
index d336b53..f66476b 100644
--- a/build/xsdc.go
+++ b/build/xsdc.go
@@ -143,9 +143,9 @@
},
})
- pkgName = strings.Replace(pkgName, ".", "_", -1)
- module.genOutputs_c = android.PathForModuleGen(ctx, "cpp", pkgName+".cpp")
- module.genOutputs_h = android.PathForModuleGen(ctx, "cpp", "include/"+pkgName+".h")
+ 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")
ctx.Build(pctx, android.BuildParams{