Merge "perfetto: Fix pkg-config compatability with the chromium build…

…" into main

gn/perfetto.gni

@@ -340,8 +340,8 @@ declare_args() {
 
   # Used by CrOS builds. Uses pkg-config to determine the appropriate flags
   # for including and linking system libraries.
-  #   set `pkg_config` to the `BUILD_PKG_CONFIG` and
-  #   set `target_pkg_config` to the target `PKG_CONFIG`.
+  #   set `host_pkg_config` to the `BUILD_PKG_CONFIG` and
+  #   set `pkg_config` to the target `PKG_CONFIG`.
   # Note: that if this is enabled `perfetto_use_system_protobuf` should be also.
   perfetto_use_pkgconfig = false
 

gn/pkg_config.gni

@@ -15,8 +15,14 @@
 import("perfetto.gni")
 
 declare_args() {
-  pkg_config = "pkg-config"
-  target_pkg_config = "pkg-config"
+  # These are provided by chromium's build/config/linux/pkg_config.gni, but
+  # need to be defined if they have not been already.
+  if (!defined(pkg_config)) {
+    pkg_config = "pkg-config"
+  }
+  if (!defined(host_pkg_config)) {
+    host_pkg_config = "pkg-config"
+  }
 }
 
 # Defines a config specifying the result of running pkg-config for the given
@@ -29,9 +35,9 @@ template("pkg_config") {
       forward_variables_from(invoker, "*")
 
       if (current_toolchain == host_toolchain) {
-        _cmd = pkg_config
+        _cmd = host_pkg_config
       } else {
-        _cmd = target_pkg_config
+        _cmd = pkg_config
       }
       _pkg_config_result =
           exec_script("//gn/pkg-config_wrapper.py", [ _cmd ] + pkg_deps, "json")