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

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

Issue 1128183010: ATK accessibility support for web content on Aura Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 | build/config/ui.gni » ('j') | content/browser/accessibility/browser_accessibility_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/linux/BUILD.gn
diff --git a/build/config/linux/BUILD.gn b/build/config/linux/BUILD.gn
index 3d65937dd42dd6cee74f4e79c9a56ec77b978446..8594f1ed91c28b4e50ccd55216bd35c1713ff188 100644
--- a/build/config/linux/BUILD.gn
+++ b/build/config/linux/BUILD.gn
@@ -35,25 +35,6 @@ config("sdk") {
}
}
-pkg_config("atk") {
- packages = [ "atk" ]
- atk_lib_dir = exec_script(pkg_config_script,
- [
- "--libdir",
- "atk",
- ],
- "string")
- defines = [ "ATK_LIB_DIR=\"$atk_lib_dir\"" ]
-}
-
-# 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("atk_warnings") {
- # glib uses the pre-c++11 typedef-as-static_assert hack.
- cflags = [ "-Wno-unused-local-typedef" ]
-}
-
config("fontconfig") {
libs = [ "fontconfig" ]
}
@@ -151,6 +132,32 @@ if (!is_chromeos) {
# If these extra checks are not run, gconf is required when building host
# tools for a CrOS build.
if (current_toolchain == default_toolchain) {
+ pkg_config("atk") {
+ packages = [ "atk" ]
+ atk_lib_dir = exec_script(pkg_config_script,
+ [
+ "--libdir",
+ "atk",
+ ],
+ "string")
+ defines = [ "ATK_LIB_DIR=\"$atk_lib_dir\"" ]
+ }
+
+ # 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("atk_warnings") {
+ cflags = [
+ # glib uses the pre-c++11 typedef-as-static_assert hack.
+ "-Wno-unused-local-typedef",
+
+ # G_DEFINE_TYPE automatically generates a *get_instance_private
+ # inline function after glib 2.37. That's unused. Prevent to
+ # complain about it.
+ "-Wno-unused-function",
+ ]
+ }
+
pkg_config("gconf") {
packages = [ "gconf-2.0" ]
defines = [ "USE_GCONF" ]
« no previous file with comments | « no previous file | build/config/ui.gni » ('j') | content/browser/accessibility/browser_accessibility_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698