libchrome: Fixup the soong pluginandroid-o-mr1-iot-release-1.0.5

This change addresses a subset of the comments left after landing
https://android-review.googlesource.com/c/platform/external/libchrome/+/757314

Bug: 109924413
Test: m
Change-Id: Id4ac6aa81e13aa382e3b009900f7e4f8ee987098

3 files changed, 5 insertions, 50 deletions

diff --git a/Android.bp b/Android.bp
index 9fd9fbda29..8f10867ba9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -685,20 +685,6 @@ python_binary_host {
     defaults: ["libmojo_scripts"],
 }
 
-python_binary_host {
-    name: "merge_srcjars",
-    main: "libchrome_tools/merge_srcjars.py",
-    srcs: ["libchrome_tools/merge_srcjars.py"],
-    version: {
-        py3: {
-            enabled: false
-        },
-        py2: {
-            enabled: true,
-        },
-    },
-}
-
 // TODO(lhchavez): Delete this once all other projects have been migrated.
 cc_prebuilt_binary {
     name: "mojom_source_generator_sh",
diff --git a/libchrome_tools/merge_srcjars.py b/libchrome_tools/merge_srcjars.py
deleted file mode 100755
index 421763ca96..0000000000
--- a/libchrome_tools/merge_srcjars.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env python2
-
-"""Merges several .srcjar files."""
-
-import argparse
-import zipfile
-
-
-def _main():
-    parser = argparse.ArgumentParser(description="Merge several .srcjar files")
-    parser.add_argument("--output", type=argparse.FileType("wb"),
-                        help="The path of the output .srcjar")
-    parser.add_argument("srcjar", metavar="SRCJAR", type=argparse.FileType("rb"),
-                        nargs="+",
-                        help="The path of the .srcjar files to merge")
-    args = parser.parse_args()
-
-    with zipfile.ZipFile(args.output, "w") as output:
-        for srcjar_path in args.srcjar:
-            with zipfile.ZipFile(srcjar_path, "r") as srcjar:
-                for path in srcjar.namelist():
-                    output.writestr(path, srcjar.read(path))
-
-
-if __name__ == "__main__":
-    _main()
diff --git a/soong/bindings_generator.go b/soong/bindings_generator.go
index 36462cb036..3d0e7f5da0 100644
--- a/soong/bindings_generator.go
+++ b/soong/bindings_generator.go
@@ -3,7 +3,6 @@ package libchrome
 import (
 	"fmt"
 	"path"
-	"path/filepath"
 	"strings"
 
 	"android/soong/android"
@@ -23,7 +22,7 @@ var (
 	pctx = android.NewPackageContext("android/soong/external/libchrome")
 
 	mojomBindingsGenerator = pctx.HostBinToolVariable("mojomBindingsGenerator", "mojom_bindings_generator")
-	mergeSrcjars           = pctx.HostBinToolVariable("mergeSrcjars", "merge_srcjars")
+	mergeZips              = pctx.HostBinToolVariable("mergeZips", "merge_zips")
 
 	generateMojomPicklesRule = pctx.StaticRule("generateMojomPicklesRule", blueprint.RuleParams{
 		Command: `${mojomBindingsGenerator}
@@ -56,9 +55,9 @@ var (
 	}, "generator", "package", "flags", "outDir", "templateDir")
 
 	mergeSrcjarsRule = pctx.StaticRule("mergeSrcjarsRule", blueprint.RuleParams{
-		Command: "${mergeSrcjars} --output=${out} ${in}",
+		Command: "${mergeZips} ${out} ${in}",
 		CommandDeps: []string{
-			"${mergeSrcjars}",
+			"${mergeZips}",
 		},
 		Description: "Merge .srcjars $in => $out",
 	})
@@ -155,12 +154,8 @@ func (p *mojomGenerationProperties) flags(ctx android.ModuleContext) string {
 	for _, typemap := range ctx.ExpandSources(p.Typemaps, nil) {
 		flags = append(flags, fmt.Sprintf("--typemap=%s", typemap.String()))
 	}
-	for _, include := range p.Includes {
-		includePath, err := filepath.Abs(include)
-		if err != nil {
-			ctx.PropertyErrorf("includes", "Failed to get the absolute path for %s: %q", include, err)
-		}
-		flags = append(flags, fmt.Sprintf("-I=%s:%s", includePath, includePath))
+	for _, include := range android.PathsForSource(ctx, p.Includes) {
+		flags = append(flags, fmt.Sprintf("-I=%s:%s", include, include))
 	}
 	for _, pickle := range p.Pickles {
 		m := android.SrcIsModule(pickle)