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

Unified Diff: chrome/browser/ui/libgtkui/BUILD.gn

Issue 2514413002: Clean up GTK3 build flags. (Closed)
Patch Set: Fixes Created 4 years, 1 month 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
Index: chrome/browser/ui/libgtkui/BUILD.gn
diff --git a/chrome/browser/ui/libgtkui/BUILD.gn b/chrome/browser/ui/libgtkui/BUILD.gn
index 41ca1920417e12152ab0f46bf387598e192e5c11..c234e66f8b0d8010c10bd31a6210d52e87364da2 100644
--- a/chrome/browser/ui/libgtkui/BUILD.gn
+++ b/chrome/browser/ui/libgtkui/BUILD.gn
@@ -5,7 +5,7 @@
assert(is_linux, "This file should only be referenced on Linux")
import("//build/config/features.gni")
-import("//build/config/ui.gni")
+import("//build/config/linux/gtk/gtk.gni")
import("//printing/features/features.gni")
# gn orders flags on a target before flags from configs. The default config
@@ -114,6 +114,20 @@ common_deps = [
"//ui/views",
]
+# Automatically depends on the GTK version associated with the current build
+# flags.
+group("libgtkui") {
+ if (use_gtk3) {
+ public_deps = [
+ ":libgtk3ui",
+ ]
+ } else {
+ public_deps = [
+ ":libgtk2ui",
+ ]
+ }
+}
+
component("libgtk2ui") {
sources = common_sources
configs += common_configs
@@ -135,6 +149,8 @@ component("libgtk2ui") {
]
}
+# This is compiled with "all" even when it's not referenced to ensure that
+# GTK3 continues to build. GTK3 is explicitly specified by some distros.
component("libgtk3ui") {
sources = common_sources
configs += common_configs

Powered by Google App Engine
This is Rietveld 408576698