Temporarily unsupport Tizen 4.0 and use only ecore_wl2

Author: swift-kim

azure-pipelines.yml

@@ -68,43 +68,20 @@ jobs:
         --runtime-mode $(mode) \
         --embedder-for-target \
         --disable-desktop-embeddings \
-        --build-tizen-shell \
-        --out-dir output/default
-      ninja -C output/default/out/linux_$(mode)_$(arch)
+        --build-tizen-shell
+      ninja -C out/linux_$(mode)_$(arch)
     displayName: Build
     workingDirectory: $(buildroot)
     failOnStderr: true
-  - bash: |
-      flutter/tools/gn \
-        --target-os linux \
-        --linux-cpu $(arch) \
-        --target-toolchain `pwd`/tizen_tools/toolchains \
-        --target-sysroot `pwd`/tizen_tools/sysroot/$(arch)_40 \
-        --target-triple $(targetTriple) \
-        --runtime-mode $(mode) \
-        --embedder-for-target \
-        --disable-desktop-embeddings \
-        --build-tizen-shell \
-        --tizen-sdk-4 \
-        --out-dir output/tizen40
-      ninja -C output/tizen40/out/linux_$(mode)_$(arch)
-    displayName: Build for Tizen 4.0
-    workingDirectory: $(buildroot)
-    condition: ne(variables['arch'], 'arm64')
-    failOnStderr: true
   - bash: |
       OUTDIR=$(Build.StagingDirectory)
-      cp default/out/linux_$(mode)_$(arch)/libflutter_engine.so $OUTDIR
-      cp default/out/linux_$(mode)_$(arch)/libflutter_tizen.so $OUTDIR
-      if [[ "$(arch)" != "arm64" ]]; then
-        cp tizen40/out/linux_$(mode)_$(arch)/libflutter_tizen.so $OUTDIR/libflutter_tizen40.so
-      fi
+      cp out/linux_$(mode)_$(arch)/libflutter_*.so $OUTDIR
       if [[ $(System.JobName) == "tizen-arm-release" ]]; then
         mkdir $OUTDIR/common
-        cp default/out/linux_$(mode)_$(arch)/{cpp_client_wrapper,icu,public} $OUTDIR/common
+        cp out/linux_$(mode)_$(arch)/{cpp_client_wrapper,icu,public} $OUTDIR/common
       fi
     displayName: Copy artifacts
-    workingDirectory: $(buildroot)/output
+    workingDirectory: $(buildroot)
     failOnStderr: true
   - publish: $(Build.StagingDirectory)
     artifact: $(System.JobName)

shell/platform/tizen/BUILD.gn

@@ -126,17 +126,9 @@ template("embedder_for_profile") {
       "//third_party/rapidjson",
     ]
 
-    if (tizen_sdk_4) {
-      sources += [ "tizen_renderer_ecore_wl.cc" ]
+    sources += [ "tizen_renderer_ecore_wl2.cc" ]
 
-      libs += [ "ecore_wayland", "wayland-egl" ]
-
-      defines = [ "FLUTTER_TIZEN_4" ]
-    } else {
-      sources += [ "tizen_renderer_ecore_wl2.cc" ]
-
-      libs += [ "ecore_wl2" ]
-    }
+    libs += [ "ecore_wl2" ]
   }
 }
 

shell/platform/tizen/channels/text_input_channel.cc

@@ -435,9 +435,7 @@ bool TextInputChannel::FilterEvent(Ecore_Event_Key* keyDownEvent) {
       ecore_device_class_get(keyDownEvent->dev));
   ecoreKeyDownEvent.dev_subclass = EoreDeviceSubClassToEcoreIMFDeviceSubClass(
       ecore_device_subclass_get(keyDownEvent->dev));
-#ifndef FLUTTER_TIZEN_4
   ecoreKeyDownEvent.keycode = keyDownEvent->keycode;
-#endif
 
   bool isIME = strcmp(device, "ime") == 0;
 

shell/platform/tizen/tizen_embedder_engine.cc

@@ -46,15 +46,9 @@ static double GetDeviceDpi() {
 TizenEmbedderEngine::TizenEmbedderEngine(
     const FlutterWindowProperties& window_properties)
     : device_profile(GetDeviceProfile()), device_dpi(GetDeviceDpi()) {
-#ifdef FLUTTER_TIZEN_4
-  tizen_renderer = std::make_unique<TizenRendererEcoreWl>(
-      *this, window_properties.x, window_properties.y, window_properties.width,
-      window_properties.height);
-#else
   tizen_renderer = std::make_unique<TizenRendererEcoreWl2>(
       *this, window_properties.x, window_properties.y, window_properties.width,
       window_properties.height);
-#endif
 
   // Run flutter task on Tizen main loop.
   // Tizen engine has four threads (GPU thread, UI thread, IO thread, platform

shell/platform/tizen/tizen_embedder_engine.h

@@ -24,11 +24,7 @@
 #include "flutter/shell/platform/tizen/public/flutter_tizen_texture_registrar.h"
 #include "flutter/shell/platform/tizen/tizen_event_loop.h"
 #include "flutter/shell/platform/tizen/tizen_renderer.h"
-#ifdef FLUTTER_TIZEN_4
-#include "flutter/shell/platform/tizen/tizen_renderer_ecore_wl.h"
-#else
 #include "flutter/shell/platform/tizen/tizen_renderer_ecore_wl2.h"
-#endif
 #include "flutter/shell/platform/tizen/tizen_vsync_waiter.h"
 #include "flutter/shell/platform/tizen/touch_event_handler.h"
 

shell/platform/tizen/tizen_renderer_ecore_wl.cc

@@ -129,7 +129,6 @@ def to_gn_args(args):
 
     gn_args['embedder_for_target'] = args.embedder_for_target
     gn_args['build_tizen_shell'] = args.build_tizen_shell
-    gn_args['tizen_sdk_4'] = args.tizen_sdk_4
 
     gn_args['enable_coverage'] = args.coverage
 
@@ -404,7 +403,6 @@ def parse_args(args):
 
   parser.add_argument('--embedder-for-target', dest='embedder_for_target', action='store_true', default=False)
   parser.add_argument('--build-tizen-shell', dest='build_tizen_shell', action='store_true', default=False)
-  parser.add_argument('--tizen-sdk-4', dest='tizen_sdk_4', action='store_true', default=False)
 
   parser.add_argument('--coverage', default=False, action='store_true')