OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/linux/pkg_config.gni") | |
5 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
6 import("//build/json_schema_api.gni") | 7 import("//build/json_schema_api.gni") |
7 import("//testing/test.gni") | 8 import("//testing/test.gni") |
8 if (is_android) { | 9 if (is_android) { |
9 import("//build/config/android/rules.gni") | 10 import("//build/config/android/rules.gni") |
10 } | 11 } |
11 | 12 |
13 pkg_config("atk") { | |
Dirk Pranke
2015/07/08 19:33:05
this and the above change probably need to be prot
brettw
2015/07/08 20:11:17
Yeah, looks like x11 is the correct condition.
llandwerlin-old
2015/07/08 20:21:07
It was under the x11 condition in build/config/lin
| |
14 packages = [ "atk" ] | |
15 atk_lib_dir = exec_script(pkg_config_script, | |
16 [ | |
17 "--libdir", | |
18 "atk", | |
19 ], | |
20 "string") | |
21 defines = [ "ATK_LIB_DIR=\"$atk_lib_dir\"" ] | |
22 } | |
23 | |
24 # gn orders flags on a target before flags from configs. The default config | |
25 # adds -Wall, and these flags have to be after -Wall -- so they need to come | |
26 # from a config and can't be on the target directly. | |
27 config("atk_warnings") { | |
28 cflags = [ | |
29 # glib uses the pre-c++11 typedef-as-static_assert hack. | |
30 "-Wno-unused-local-typedef", | |
31 | |
32 # G_DEFINE_TYPE automatically generates a *get_instance_private | |
33 # inline function after glib 2.37. That's unused. Prevent to | |
34 # complain about it. | |
35 "-Wno-unused-function", | |
36 ] | |
37 } | |
38 | |
12 component("accessibility") { | 39 component("accessibility") { |
13 sources = [ | 40 sources = [ |
14 "ax_node.cc", | 41 "ax_node.cc", |
15 "ax_node.h", | 42 "ax_node.h", |
16 "ax_node_data.cc", | 43 "ax_node_data.cc", |
17 "ax_node_data.h", | 44 "ax_node_data.h", |
18 "ax_serializable_tree.cc", | 45 "ax_serializable_tree.cc", |
19 "ax_serializable_tree.h", | 46 "ax_serializable_tree.h", |
20 "ax_text_utils.cc", | 47 "ax_text_utils.cc", |
21 "ax_text_utils.h", | 48 "ax_text_utils.h", |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
54 | 81 |
55 if (use_aura && !is_chromeos && is_linux && use_x11) { | 82 if (use_aura && !is_chromeos && is_linux && use_x11) { |
56 sources += [ | 83 sources += [ |
57 "platform/atk_util_auralinux.cc", | 84 "platform/atk_util_auralinux.cc", |
58 "platform/atk_util_auralinux.h", | 85 "platform/atk_util_auralinux.h", |
59 "platform/ax_platform_node_auralinux.cc", | 86 "platform/ax_platform_node_auralinux.cc", |
60 "platform/ax_platform_node_auralinux.h", | 87 "platform/ax_platform_node_auralinux.h", |
61 ] | 88 ] |
62 | 89 |
63 configs += [ | 90 configs += [ |
64 "//build/config/linux:atk", | 91 ":atk", |
65 "//build/config/linux:atk_warnings", | 92 ":atk_warnings", |
66 "//build/config/linux:gconf", | 93 "//build/config/linux:gconf", |
67 "//build/config/linux:glib", | 94 "//build/config/linux:glib", |
68 ] | 95 ] |
69 } | 96 } |
70 } | 97 } |
71 | 98 |
72 if (is_android) { | 99 if (is_android) { |
73 android_library("ui_accessibility_java") { | 100 android_library("ui_accessibility_java") { |
74 deps = [] | 101 deps = [] |
75 srcjar_deps = [ ":ax_enumerations_srcjar" ] | 102 srcjar_deps = [ ":ax_enumerations_srcjar" ] |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
125 json_schema_api("ax_gen") { | 152 json_schema_api("ax_gen") { |
126 sources = [ | 153 sources = [ |
127 "ax_enums.idl", | 154 "ax_enums.idl", |
128 ] | 155 ] |
129 deps = [ | 156 deps = [ |
130 "//base/third_party/dynamic_annotations", | 157 "//base/third_party/dynamic_annotations", |
131 ] | 158 ] |
132 root_namespace = "ui" | 159 root_namespace = "ui" |
133 schemas = true | 160 schemas = true |
134 } | 161 } |
OLD | NEW |