BUILD.gn: do not redefine use_libpci if already present

We want to move the definition of use_libpci from gpu/config to ANGLE. To avoid breaking compilation we should do it in three steps: - Make ANGLE not redefine use_libpci - Remove definition of use_libpci from Chrome - Make ANGLE define use_libpci unconditionnaly This commit is the first step. BUG=angleproject:1874 Change-Id: I08d0996ca536c51e1617f656171d696f05605725 Reviewed-on: https://chromium-review.googlesource.com/450037Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>

BUILD.gn: do not redefine use_libpci if already present
05356e35 · Corentin Wallez · Commit Bot · 817232ef · 05356e35
Commit 05356e35 authored Mar 03, 2017 by Corentin Wallez Committed by Commit Bot Mar 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

BUILD.gn BUILD.gn +6 -4

No files found.
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -225,10 +225,12 @@ static_library("angle_gpu_info_util") {
    }
  }

-  # Taken from gpu/config/BUILD.gn
-  # TODO(cwallez): this should be in a shared location
-  use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
-               (use_x11 || use_ozone)
+  if (!defined(use_lipci)) {
+    # Use the PCI lib to collect GPU information on Linux.
+    use_libpci = is_linux && (!is_chromecast || is_cast_desktop_build) &&
+                 (use_x11 || use_ozone)
+  }
+
  if (use_libpci) {
    sources +=
        rebase_path(gles_gypi.libangle_gpu_info_util_libpci_sources, ".", "src")