Index: ui/accessibility/BUILD.gn |
diff --git a/ui/accessibility/BUILD.gn b/ui/accessibility/BUILD.gn |
index 3fc3ba9ab4b89a609753b2bcecc7da929a15ed1d..cf57540d8d0f98df6b4c764a4572edd8af137810 100644 |
--- a/ui/accessibility/BUILD.gn |
+++ b/ui/accessibility/BUILD.gn |
@@ -10,34 +10,6 @@ if (is_android) { |
import("//build/config/android/rules.gni") |
} |
-if (use_x11) { |
- 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", |
- ] |
- } |
-} |
- |
component("accessibility") { |
sources = [ |
"ax_node.cc", |
@@ -81,7 +53,7 @@ component("accessibility") { |
public_deps += [ "//third_party/iaccessible2" ] |
} |
- if (use_aura && !is_chromeos && is_linux && use_x11) { |
+ if (use_atk) { |
sources += [ |
"platform/atk_util_auralinux.cc", |
"platform/atk_util_auralinux.h", |
@@ -90,8 +62,8 @@ component("accessibility") { |
] |
configs += [ |
- ":atk", |
- ":atk_warnings", |
+ "//build/config/linux:atk", |
+ "//build/config/linux:atk_warnings", |
"//build/config/linux:gconf", |
"//build/config/linux:glib", |
] |