Delete unnecessary condition of generate_root.py, BUILD.gn

flutter-tizen · Feb 9, 2023 · 6b0a2d8 · 6b0a2d8
1 parent aa1c87d
commit 6b0a2d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 38 deletions.
diff --git a/flutter/shell/platform/tizen/BUILD.gn b/flutter/shell/platform/tizen/BUILD.gn
@@ -143,18 +143,23 @@ template("embedder") {
         "external_texture_pixel_egl.cc",
         "external_texture_surface_egl.cc",
         "flutter_platform_node_delegate_tizen.cc",
+        "tizen_autofill.cc",
         "tizen_renderer_egl.cc",
         "tizen_vsync_waiter.cc",
         "tizen_window_ecore_wl2.cc",
       ]
 
       libs += [
+        "capi-ui-autofill",
+        "capi-ui-autofill-common",
         "ecore_wl2",
         "tdm-client",
         "tizen-extension-client",
         "EGL",
         "GLESv2",
       ]
+
+      defines += [ "AUTOFILL_SUPPORT" ]
     }
 
     if (target_name == "flutter_tizen_common") {
@@ -174,34 +179,7 @@ template("embedder") {
     defines += invoker.defines
     defines += [ "FLUTTER_ENGINE_NO_PROTOTYPES" ]
 
-    if (api_version == "5.5") {
-      major_version = 5
-      minor_version = 5
-    } else if (api_version == "6.0") {
-      major_version = 6
-      minor_version = 0
-    } else if (api_version == "6.5") {
-      major_version = 6
-      minor_version = 5
-    } else if (api_version == "7.0") {
-      major_version = 7
-      minor_version = 0
-    }
-
-    if (((major_version >= 5 && minor_version >= 5) || major_version >= 6) &&
-        target_name != "flutter_tizen_wearable") {
-      sources += [ "tizen_autofill.cc" ]
-
-      libs += [
-        "capi-ui-autofill",
-        "capi-ui-autofill-common",
-      ]
-
-      defines += [ "AUTOFILL_SUPPORT" ]
-    }
-
-    if (((major_version >= 6 && minor_version >= 5) || major_version >= 7) &&
-        target_name != "flutter_tizen_wearable") {
+    if (api_version == "6.5" && target_name != "flutter_tizen_wearable") {
       sources += [
         "flutter_tizen_nui.cc",
         "nui_autofill_popup.cc",

diff --git a/tools/generate_sysroot.py b/tools/generate_sysroot.py
@@ -41,6 +41,10 @@
   'capi-system-info-devel',
   'capi-system-system-settings',
   'capi-system-system-settings-devel',
+  'capi-ui-autofill',
+  'capi-ui-autofill-devel',
+  'capi-ui-autofill-common',
+  'capi-ui-autofill-common-devel',
   'capi-ui-efl-util',
   'capi-ui-efl-util-devel',
   'cbhm',
@@ -113,14 +117,6 @@
   'wayland-devel',
 ]
 
-# Only available for Tizen 5.5 and above.
-autofill_packages = [
-  'capi-ui-autofill',
-  'capi-ui-autofill-devel',
-  'capi-ui-autofill-common',
-  'capi-ui-autofill-common-devel',
-]
-
 # Only available for Tizen 6.5 and above.
 dali_packages = [
   'dali2',
@@ -163,8 +159,6 @@ def generate_sysroot(sysroot: Path, api_version: float, arch: str, quiet=False):
   existing_rpms = [f for f in download_path.iterdir() if f.suffix == '.rpm']
 
   packages = base_packages + unified_packages
-  if api_version >= 5.5:
-    packages += autofill_packages
 
   if api_version >= 6.5:
     packages += dali_packages