Land prep work to enable NaCl in the Linux x64 GN builds.

third_party/harfbuzz-ng/BUILD.gn

Index: third_party/harfbuzz-ng/BUILD.gn
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
index 71213fd42945432143bb50f7b79cda3747f49b23..90b200f3897a6209cbc4060a25cf7b60e432de07 100644
--- a/third_party/harfbuzz-ng/BUILD.gn
+++ b/third_party/harfbuzz-ng/BUILD.gn
@@ -13,27 +13,20 @@ import("//build/config/linux/pkg_config.gni")
 # don't want to bloat the binary more by including another copy.
 
 declare_args() {
-  if (is_linux && (!is_official_build || is_chromeos)) {
-    # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
-    # anyways. However, we want to have control of the version of harfbuzz
-    # we use, so don't use system harfbuzz for official builds, unless we
-    # are building for chrome os, where we have the system harfbuzz under
-    # control as well.
-    use_system_harfbuzz = exec_script(pkg_config_script,
-                                      pkg_config_args + [
-                                            "--atleast-version=1.31.0",
-                                            "pangoft2",
-                                          ],
-                                      "value")
-  } else {
-    use_system_harfbuzz = false
-  }
-  if (is_linux && current_cpu == "arm" && !is_chromeos) {
-    # Override use_system_harfbuzz for ARM cross compiling so system
-    # harfbuzz is not used because the corresponding package is not
-    # available.
-    use_system_harfbuzz = false
-  }
+  # Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
+  # anyways. However, we want to have control of the version of harfbuzz
+  # we use, so don't use system harfbuzz for official builds, unless we
+  # are building for chrome os, where we have the system harfbuzz under
+  # control as well. We also do not want to use the system harfbuzz
+  # when cross-compiling for ARM.
+  use_system_harfbuzz = is_linux && (is_chromeos || (!is_official_build &&
+                                                     current_cpu != "arm")) &&
+                        exec_script(pkg_config_script,
+                                    pkg_config_args + [
+                                          "--atleast-version=1.31.0",
+                                          "pangoft2",
+                                        ],
+                                    "value")

[Dirk Pranke, 2015/02/25 21:08:46]

Brett, can you double-check that this is right?

The prior version of this causes GN to complain about use_system_harfbuzz being
declared multiple times. I had originally worked around this by declaring
use_system_harfbuzz = false and the updating the value, and I was pretty sure
that was working at one point, but now GN won't let me do that either.

[brettw, 2015/02/25 21:27:30]

Seems OK.

 }
 
 if (use_system_harfbuzz) {