Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Unified Diff: third_party/instrumented_libraries/BUILD.gn

Issue 2574633002: Don't use gtk2 instrumented library when using gtk3 (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/instrumented_libraries/BUILD.gn
diff --git a/third_party/instrumented_libraries/BUILD.gn b/third_party/instrumented_libraries/BUILD.gn
index 2309519a46ccd44ef1817b83a13a22947f6266cc..35b21a404218ad239b916809ea6580708f4f7ff0 100644
--- a/third_party/instrumented_libraries/BUILD.gn
+++ b/third_party/instrumented_libraries/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 @@ if (use_locally_built_instrumented_libraries) {
":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 @@ if (use_locally_built_instrumented_libraries) {
":udev",
":zlib1g",
]
+ if (!use_gtk3) {
+ deps += [
+ ":libgdk-pixbuf2.0-0",
+ ":libgtk2.0-0",
+ ]
+ }
if (is_precise) {
deps += [ ":libtasn1-3" ]
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698