Skip to content

Commit c13a0c5

Browse files
swift-kimswift-kim
committed
[a11y] Resolve build errors
1 parent 6112c3c commit c13a0c5

File tree

6 files changed

+31
-181
lines changed

6 files changed

+31
-181
lines changed

‎flutter/third_party/accessibility/BUILD.gn

Lines changed: 11 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,23 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//flutter/common/config.gni")
6-
import("//flutter/testing/testing.gni")
7-
85
config("accessibility_config") {
96
visibility = [
107
"//flutter/shell/platform/common:common_cpp_accessibility",
118
"//flutter/third_party/accessibility/*",
129
]
13-
if (is_win) {
14-
# TODO(cbracken): https://github.com/flutter/flutter/issues/92229
15-
defines = [ "_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING" ]
16-
}
17-
include_dirs = [ "//flutter/third_party/accessibility" ]
18-
if (is_linux) {
19-
include_dirs += [
20-
"$custom_sysroot/usr/include/atk-1.0",
21-
"$custom_sysroot/usr/include/at-spi2-atk/2.0",
22-
"$custom_sysroot/usr/include/glib-2.0",
23-
]
2410

25-
if (target_cpu == "arm64") {
26-
include_dirs += [ "$custom_sysroot/usr/lib64/glib-2.0/include" ]
27-
} else {
28-
include_dirs += [ "$custom_sysroot/usr/lib/glib-2.0/include" ]
29-
}
11+
include_dirs = [
12+
"//flutter/third_party/accessibility",
13+
"${sysroot_path}/usr/include/atk-1.0",
14+
"${sysroot_path}/usr/include/at-spi2-atk/2.0",
15+
"${sysroot_path}/usr/include/glib-2.0",
16+
]
17+
18+
if (target_cpu == "arm64") {
19+
include_dirs += [ "${sysroot_path}/usr/lib64/glib-2.0/include" ]
20+
} else {
21+
include_dirs += [ "${sysroot_path}/usr/lib/glib-2.0/include" ]
3022
}
3123
}
3224

@@ -41,85 +33,4 @@ source_set("accessibility") {
4133
]
4234

4335
public_configs = [ ":accessibility_config" ]
44-
45-
if (is_mac) {
46-
frameworks = [
47-
"AppKit.framework",
48-
"CoreFoundation.framework",
49-
"CoreGraphics.framework",
50-
"CoreText.framework",
51-
"IOSurface.framework",
52-
]
53-
}
54-
}
55-
56-
if (enable_unittests) {
57-
test_fixtures("accessibility_fixtures") {
58-
fixtures = []
59-
}
60-
61-
executable("accessibility_unittests") {
62-
testonly = true
63-
64-
public_configs = [ ":accessibility_config" ]
65-
66-
if (is_mac || is_win) {
67-
sources = [
68-
"ax/ax_enum_util_unittest.cc",
69-
"ax/ax_event_generator_unittest.cc",
70-
"ax/ax_node_data_unittest.cc",
71-
"ax/ax_node_position_unittest.cc",
72-
"ax/ax_range_unittest.cc",
73-
"ax/ax_role_properties_unittest.cc",
74-
"ax/ax_table_info_unittest.cc",
75-
"ax/ax_tree_unittest.cc",
76-
"ax/test_ax_node_helper.cc",
77-
"ax/test_ax_node_helper.h",
78-
"ax/test_ax_tree_manager.cc",
79-
"ax/test_ax_tree_manager.h",
80-
]
81-
82-
sources += [
83-
"ax/platform/ax_platform_node_base_unittest.cc",
84-
"ax/platform/ax_platform_node_unittest.cc",
85-
"ax/platform/ax_platform_node_unittest.h",
86-
"ax/platform/ax_unique_id_unittest.cc",
87-
"ax/platform/test_ax_node_wrapper.cc",
88-
"ax/platform/test_ax_node_wrapper.h",
89-
]
90-
91-
if (is_win) {
92-
sources += [
93-
"ax/platform/ax_fragment_root_win_unittest.cc",
94-
"ax/platform/ax_platform_node_win_unittest.cc",
95-
"base/win/dispatch_stub.cc",
96-
"base/win/dispatch_stub.h",
97-
"base/win/display_unittest.cc",
98-
"base/win/scoped_bstr_unittest.cc",
99-
"base/win/scoped_safearray_unittest.cc",
100-
"base/win/scoped_variant_unittest.cc",
101-
]
102-
}
103-
104-
sources += [
105-
"base/logging_unittests.cc",
106-
"base/string_utils_unittest.cc",
107-
"gfx/geometry/insets_unittest.cc",
108-
"gfx/geometry/point_unittest.cc",
109-
"gfx/geometry/rect_unittest.cc",
110-
"gfx/geometry/size_unittest.cc",
111-
"gfx/geometry/vector2d_unittest.cc",
112-
"gfx/range/range_unittest.cc",
113-
"gfx/test/gfx_util.cc",
114-
"gfx/test/gfx_util.h",
115-
]
116-
117-
deps = [
118-
":accessibility",
119-
":accessibility_fixtures",
120-
"//flutter/testing",
121-
"//flutter/testing:dart",
122-
]
123-
}
124-
}
12536
}

‎flutter/third_party/accessibility/ax/BUILD.gn

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//flutter/common/config.gni")
6-
75
source_set("ax") {
86
visibility = [ "//flutter/third_party/accessibility/*" ]
97
public_configs =
108
[ "//flutter/third_party/accessibility:accessibility_config" ]
119

12-
configs -= [ "//build/config/compiler:no_rtti" ]
13-
1410
sources = [
1511
"platform/ax_platform_node.cc",
1612
"platform/ax_platform_node.h",
@@ -84,44 +80,21 @@ source_set("ax") {
8480
"ax_tree_update.h",
8581
]
8682

87-
if (is_mac) {
88-
sources += [
89-
"platform/ax_platform_node_mac.h",
90-
"platform/ax_platform_node_mac.mm",
91-
]
92-
} else if (is_win) {
93-
sources += [
94-
"platform/ax_fragment_root_delegate_win.h",
95-
"platform/ax_fragment_root_win.cc",
96-
"platform/ax_fragment_root_win.h",
97-
"platform/ax_platform_node_delegate_utils_win.cc",
98-
"platform/ax_platform_node_delegate_utils_win.h",
99-
"platform/ax_platform_node_win.cc",
100-
"platform/ax_platform_node_win.h",
101-
"platform/uia_registrar_win.cc",
102-
"platform/uia_registrar_win.h",
103-
]
104-
libs = [
105-
"oleacc.lib",
106-
"uiautomationcore.lib",
107-
]
108-
} else if (is_linux) {
109-
sources += [
110-
"platform/atk_util_auralinux.cc",
111-
"platform/atk_util_auralinux.h",
112-
"platform/atk_util_auralinux_gtk.cc",
113-
"platform/ax_platform_atk_hyperlink.cc",
114-
"platform/ax_platform_atk_hyperlink.h",
115-
"platform/ax_platform_node_auralinux.cc",
116-
"platform/ax_platform_node_auralinux.h",
117-
]
118-
libs = [
119-
"atk-1.0",
120-
"atk-bridge-2.0",
121-
"glib-2.0",
122-
"gobject-2.0",
123-
]
124-
}
83+
sources += [
84+
"platform/atk_util_auralinux.cc",
85+
"platform/atk_util_auralinux.h",
86+
"platform/atk_util_auralinux_gtk.cc",
87+
"platform/ax_platform_atk_hyperlink.cc",
88+
"platform/ax_platform_atk_hyperlink.h",
89+
"platform/ax_platform_node_auralinux.cc",
90+
"platform/ax_platform_node_auralinux.h",
91+
]
92+
libs = [
93+
"atk-1.0",
94+
"atk-bridge-2.0",
95+
"glib-2.0",
96+
"gobject-2.0",
97+
]
12598

12699
public_deps = [
127100
"//flutter/third_party/accessibility/ax_build",

‎flutter/third_party/accessibility/ax/platform/ax_platform_atk_hyperlink.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,11 @@ static void AXPlatformAtkHyperlinkClassInit(AtkHyperlinkClass* klass) {
102102
GObjectClass* gobject_class = G_OBJECT_CLASS(klass);
103103
kAXPlatformAtkHyperlinkParentClass = g_type_class_peek_parent(klass);
104104

105+
#pragma clang diagnostic push
106+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
105107
g_type_class_add_private(gobject_class,
106108
sizeof(AXPlatformAtkHyperlinkPrivate));
109+
#pragma clang diagnostic pop
107110

108111
gobject_class->finalize = AXPlatformAtkHyperlinkFinalize;
109112
klass->get_uri = AXPlatformAtkHyperlinkGetUri;

‎flutter/third_party/accessibility/ax/platform/ax_platform_node_auralinux.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4790,9 +4790,9 @@ AXPlatformNodeAuraLinux::GetUnclippedHypertextRangeBoundsRect(int start_offset,
47904790
end_offset = UnicodeToUTF16OffsetInText(end_offset);
47914791

47924792
std::u16string text = GetHypertext();
4793-
if (start_offset < 0 || start_offset > int{text.length()})
4793+
if (start_offset < 0 || start_offset > static_cast<int>(text.length()))
47944794
return std::nullopt;
4795-
if (end_offset < 0 || end_offset > int{text.length()})
4795+
if (end_offset < 0 || end_offset > static_cast<int>(text.length()))
47964796
return std::nullopt;
47974797

47984798
if (end_offset < start_offset)

‎flutter/third_party/accessibility/base/BUILD.gn

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//flutter/common/config.gni")
6-
75
source_set("base") {
86
visibility = [ "//flutter/third_party/accessibility/*" ]
97
include_dirs = [ "//flutter/third_party/accessibility" ]
@@ -22,36 +20,10 @@ source_set("base") {
2220
"string_utils.cc",
2321
"string_utils.h",
2422
]
25-
if (is_win) {
26-
sources += [
27-
"win/atl.h",
28-
"win/atl_module.h",
29-
"win/display.cc",
30-
"win/display.h",
31-
"win/enum_variant.cc",
32-
"win/enum_variant.h",
33-
"win/scoped_bstr.cc",
34-
"win/scoped_bstr.h",
35-
"win/scoped_safearray.h",
36-
"win/scoped_variant.cc",
37-
"win/scoped_variant.h",
38-
"win/variant_util.h",
39-
"win/variant_vector.cc",
40-
"win/variant_vector.h",
41-
]
42-
libs = [ "propsys.lib" ]
43-
}
44-
if (is_mac) {
45-
sources += [
46-
"platform/darwin/scoped_nsobject.h",
47-
"platform/darwin/scoped_nsobject.mm",
48-
]
49-
}
5023

5124
public_deps = [
5225
"numerics",
5326
"//flutter/fml:string_conversion",
5427
"//flutter/third_party/accessibility/ax_build",
55-
"//third_party/dart/runtime/third_party/double-conversion/src:libdouble_conversion",
5628
]
5729
}

‎flutter/third_party/accessibility/gfx/BUILD.gn

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# Use of this source code is governed by a BSD-style license that can be
33
# found in the LICENSE file.
44

5-
import("//flutter/common/config.gni")
6-
75
source_set("gfx") {
86
visibility = [ "//flutter/third_party/accessibility/*" ]
97
include_dirs = [ "//flutter/third_party/accessibility" ]
@@ -46,13 +44,6 @@ source_set("gfx") {
4644
"transform.h",
4745
]
4846

49-
if (is_mac) {
50-
sources += [
51-
"mac/coordinate_conversion.h",
52-
"mac/coordinate_conversion.mm",
53-
]
54-
}
55-
5647
deps = [
5748
"//flutter/third_party/accessibility/ax_build",
5849
"//flutter/third_party/accessibility/base",

0 commit comments

Comments
 (0)