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

Unified Diff: build/config/linux/atk/BUILD.gn

Issue 2251673004: remove duplicate atk GN config (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make use of use_atk instead of use_x11 Created 4 years, 4 months 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 | content/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/atk/BUILD.gn
diff --git a/build/config/linux/atk/BUILD.gn b/build/config/linux/atk/BUILD.gn
index 32eaf88a5e447227e59df3c6910f3f56d2c7d97c..27e8f41a524a0b421f14632c6bf2f4a02f9f467c 100644
--- a/build/config/linux/atk/BUILD.gn
+++ b/build/config/linux/atk/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/features.gni")
import("//build/config/linux/pkg_config.gni")
+import("//build/config/ui.gni")
# CrOS doesn't install GTK, gconf or any gnome packages.
assert(!is_chromeos)
@@ -13,7 +14,11 @@ assert(!is_chromeos)
# tools for a CrOS build.
assert(current_toolchain == default_toolchain)
-pkg_config("atk") {
+if (use_atk) {
+ assert(use_glib, "use_atk=true requires that use_glib=true")
+}
+
+pkg_config("atk_base") {
packages = [ "atk" ]
atk_lib_dir = exec_script(pkg_config_script,
pkg_config_args + [
@@ -27,7 +32,9 @@ pkg_config("atk") {
# gn orders flags on a target before flags from configs. The default config
# adds -Wall, and these flags have to be after -Wall -- so they need to
# come from a config and can't be on the target directly.
-config("warnings") {
+config("atk") {
+ configs = [ ":atk_base" ]
+
cflags = [
# glib uses the pre-c++11 typedef-as-static_assert hack.
"-Wno-unused-local-typedef",
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698