commit 5b6f777da671be977f56f0e8fc3469a3ccbb4474
author thomasanderson <thomasanderson@google.com> Sat Jan 07 03:49:56 2017
committer Commit bot <commit-bot@chromium.org> Sat Jan 07 03:49:56 2017
tree 1ae11346d5977e85e3eb1d64a87431e85f817d98
parent 45f5814b1543e41ea0be54c771e3840ea52cca4a

Don't use gtk2 instrumented library when using gtk3

BUG=668446
TBR=glider@chromium.org

Review-Url: https://codereview.chromium.org/2574633002
Cr-Original-Commit-Position: refs/heads/master@{#442150}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c48bc79acb2ed96e2f71856c01b57ce369681ba7

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 2309519..35b21a4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/goma.gni")
 
@@ -122,11 +123,9 @@
       ":libfontconfig1",
       ":libgconf-2-4",
       ":libgcrypt11",
-      ":libgdk-pixbuf2.0-0",
       ":libglib2.0-0",
       ":libgnome-keyring0",
       ":libgpg-error0",
-      ":libgtk2.0-0",
       ":libnspr4",
       ":libp11-kit0",
       ":libpci3",
@@ -155,6 +154,12 @@
       ":udev",
       ":zlib1g",
     ]
+    if (!use_gtk3) {
+      deps += [
+        ":libgdk-pixbuf2.0-0",
+        ":libgtk2.0-0",
+      ]
+    }
     if (is_precise) {
       deps += [ ":libtasn1-3" ]
     }