Commit 5fed7053 authored by Lei Zhang's avatar Lei Zhang Committed by Commit Bot

Merge //build/config/linux/atk:atk target with atk_base.

All the extra flags passed in it are no longer necessary.

Bug: 1067755
Change-Id: I934198975463fcbbae8ec3bf6419ce962d0fe0f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2135878Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756747}
parent 9991a0f5
...@@ -16,7 +16,7 @@ if (use_atk) { ...@@ -16,7 +16,7 @@ if (use_atk) {
assert(use_glib, "use_atk=true requires that use_glib=true") assert(use_glib, "use_atk=true requires that use_glib=true")
} }
pkg_config("atk_base") { pkg_config("atk") {
packages = [ packages = [
"atk", "atk",
"atk-bridge-2.0", "atk-bridge-2.0",
...@@ -38,15 +38,3 @@ pkg_config("atk_base") { ...@@ -38,15 +38,3 @@ pkg_config("atk_base") {
"ATK_DISABLE_DEPRECATION_WARNINGS", "ATK_DISABLE_DEPRECATION_WARNINGS",
] ]
} }
# 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") {
configs = [ ":atk_base" ]
if (is_clang) {
# glib uses the pre-c++11 typedef-as-static_assert hack.
cflags = [ "-Wno-unused-local-typedef" ]
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment