Skip to content

Commit 6b0a2d8

Browse files
committed
Delete unnecessary condition of generate_root.py, BUILD.gn
1 parent aa1c87d commit 6b0a2d8

File tree

2 files changed

+10
-38
lines changed

2 files changed

+10
-38
lines changed

flutter/shell/platform/tizen/BUILD.gn

+6-28
Original file line numberDiff line numberDiff line change
@@ -143,18 +143,23 @@ template("embedder") {
143143
"external_texture_pixel_egl.cc",
144144
"external_texture_surface_egl.cc",
145145
"flutter_platform_node_delegate_tizen.cc",
146+
"tizen_autofill.cc",
146147
"tizen_renderer_egl.cc",
147148
"tizen_vsync_waiter.cc",
148149
"tizen_window_ecore_wl2.cc",
149150
]
150151

151152
libs += [
153+
"capi-ui-autofill",
154+
"capi-ui-autofill-common",
152155
"ecore_wl2",
153156
"tdm-client",
154157
"tizen-extension-client",
155158
"EGL",
156159
"GLESv2",
157160
]
161+
162+
defines += [ "AUTOFILL_SUPPORT" ]
158163
}
159164

160165
if (target_name == "flutter_tizen_common") {
@@ -174,34 +179,7 @@ template("embedder") {
174179
defines += invoker.defines
175180
defines += [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
176181

177-
if (api_version == "5.5") {
178-
major_version = 5
179-
minor_version = 5
180-
} else if (api_version == "6.0") {
181-
major_version = 6
182-
minor_version = 0
183-
} else if (api_version == "6.5") {
184-
major_version = 6
185-
minor_version = 5
186-
} else if (api_version == "7.0") {
187-
major_version = 7
188-
minor_version = 0
189-
}
190-
191-
if (((major_version >= 5 && minor_version >= 5) || major_version >= 6) &&
192-
target_name != "flutter_tizen_wearable") {
193-
sources += [ "tizen_autofill.cc" ]
194-
195-
libs += [
196-
"capi-ui-autofill",
197-
"capi-ui-autofill-common",
198-
]
199-
200-
defines += [ "AUTOFILL_SUPPORT" ]
201-
}
202-
203-
if (((major_version >= 6 && minor_version >= 5) || major_version >= 7) &&
204-
target_name != "flutter_tizen_wearable") {
182+
if (api_version == "6.5" && target_name != "flutter_tizen_wearable") {
205183
sources += [
206184
"flutter_tizen_nui.cc",
207185
"nui_autofill_popup.cc",

tools/generate_sysroot.py

+4-10
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
'capi-system-info-devel',
4242
'capi-system-system-settings',
4343
'capi-system-system-settings-devel',
44+
'capi-ui-autofill',
45+
'capi-ui-autofill-devel',
46+
'capi-ui-autofill-common',
47+
'capi-ui-autofill-common-devel',
4448
'capi-ui-efl-util',
4549
'capi-ui-efl-util-devel',
4650
'cbhm',
@@ -113,14 +117,6 @@
113117
'wayland-devel',
114118
]
115119

116-
# Only available for Tizen 5.5 and above.
117-
autofill_packages = [
118-
'capi-ui-autofill',
119-
'capi-ui-autofill-devel',
120-
'capi-ui-autofill-common',
121-
'capi-ui-autofill-common-devel',
122-
]
123-
124120
# Only available for Tizen 6.5 and above.
125121
dali_packages = [
126122
'dali2',
@@ -163,8 +159,6 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
163159
existing_rpms = [f for f in download_path.iterdir() if f.suffix == '.rpm']
164160

165161
packages = base_packages + unified_packages
166-
if api_version >= 5.5:
167-
packages += autofill_packages
168162

169163
if api_version >= 6.5:
170164
packages += dali_packages

0 commit comments

Comments
 (0)