Fix cross-compilation for aarch64 on Ubuntu 25.10 (project-chip#43706)

* Fix cross-compilation for aarch64 on Ubuntu 25.10

* Post-process generated stub files instead of adding definition to command line

Author: arkq

build/chip/linux/gdbus_library.gni

@@ -36,8 +36,8 @@ template("gdbus_library") {
   }
 
   config("${library_name}_compile_config") {
-    # dbus code generation may generate some code detected as unreacheable
-    # by recent enough clang
+    # D-Bus code generation may generate some code detected as unreachable
+    # by recent enough clang.
     cflags = [ "-Wno-unreachable-code" ]
   }
 
@@ -64,31 +64,25 @@ template("gdbus_library") {
     ]
 
     args = [
-      "--input",
-      "{{source}}",
-      "--output_c",
+      "--output-c",
       rebase_path(source_file, root_build_dir),
-      "--output_h",
+      "--output-h",
       rebase_path(header_file, root_build_dir),
     ]
 
     if (defined(invoker.c_namespace)) {
-      args += [
-        "--c-namespace",
-        invoker.c_namespace,
-      ]
+      args += [ "--c-namespace=" + invoker.c_namespace ]
     }
 
     if (defined(invoker.interface_prefix)) {
-      args += [
-        "--interface-prefix",
-        invoker.interface_prefix,
-      ]
+      args += [ "--interface-prefix=" + invoker.interface_prefix ]
     }
 
     if (invoker.c_generate_object_manager) {
       args += [ "--c-generate-object-manager" ]
     }
+
+    args += [ "{{source}}" ]
   }
 
   static_library(library_name) {

build/chip/linux/gen_gdbus_wrapper.py

@@ -19,66 +19,42 @@
 import sys
 
 
-def main(argv):
-    parser = argparse.ArgumentParser(description=("Generate dbus bindings."))
-
-    parser.add_argument("--input_file",
-                        required=True,
-                        help="The dbus service definition XML file.")
-
-    parser.add_argument(
-        "--output_c",
-        help="The source file to generate containing the GDBus proxy implementation"
-    )
-
-    parser.add_argument(
-        "--output_h",
-        help="The header file to generate containing the GDBus proxy interface"
-    )
-
-    parser.add_argument("--c-namespace",
-                        default=None,
-                        help="Prefix APIs with C namespace")
-
-    parser.add_argument("--interface-prefix",
-                        default=None,
-                        help="Add interface prefix")
-
-    parser.add_argument("--c-generate-object-manager",
-                        default=False, action='store_true',
-                        help="Generate object manager")
-
-    options = parser.parse_args(argv)
-
-    extra_args = []
-    if options.c_namespace:
-        extra_args += ["--c-namespace", options.c_namespace]
-
-    if options.interface_prefix:
-        extra_args += ["--interface-prefix", options.interface_prefix]
-
-    if options.c_generate_object_manager:
-        extra_args += ["--c-generate-object-manager"]
+def main():
+    parser = argparse.ArgumentParser(description="Generate D-Bus bindings")
+    parser.add_argument("--output-c",
+                        help="The source file to generate containing the GDBus proxy implementation")
+    parser.add_argument("--output-h",
+                        help="The header file to generate containing the GDBus proxy interface")
+    # Parse our options and forward anything else.
+    options, extra_args = parser.parse_known_args()
 
     if options.output_c:
-        gdbus_args = ["gdbus-codegen", "--body", "--output", options.output_c
-                      ] + extra_args + [options.input_file]
-        subprocess.check_call(gdbus_args)
-        sed_args = ["sed", "-i",
-                    r"s/config\.h/BuildConfig.h/g", options.output_c]
-        if sys.platform == "darwin":
-            sed_args = ["sed", "-i", "",
-                        r"s/config\.h/BuildConfig.h/g", options.output_c]
-        subprocess.check_call(sed_args)
+        subprocess.check_call(["gdbus-codegen", "--body", "--output", options.output_c] + extra_args)
+        with open(options.output_c) as f:
+            content = f.read()
+        # Replace configuration header file generated by gdbus-codegen.
+        content = content.replace('include "config.h"', 'include "BuildConfig.h"')
+        with open(options.output_c, "w") as f:
+            f.write(content)
 
     if options.output_h:
-        gdbus_args = [
-            "gdbus-codegen", "--header", "--output", options.output_h
-        ] + extra_args + [options.input_file]
-        subprocess.check_call(gdbus_args)
+        subprocess.check_call(["gdbus-codegen", "--header", "--output", options.output_h] + extra_args)
+        with open(options.output_h) as f:
+            content = f.read()
+        # Code generated with new gdbus-codegen adds checks for `GLIB_VERSION_2_84` which might
+        # not yet be defined when compiling with older glib versions (e.g. cross-compilation).
+        # This manually provided definition solves the problem with undefined identifiers.
+        content = content.replace("G_BEGIN_DECLS", """
+#ifndef GLIB_VERSION_2_84
+#define GLIB_VERSION_2_84 G_ENCODE_VERSION(2, 84)
+#endif
+G_BEGIN_DECLS
+""")
+        with open(options.output_h, "w") as f:
+            f.write(content)
 
     return 0
 
 
 if __name__ == '__main__':
-    sys.exit(main(sys.argv[1:]))
+    sys.exit(main())