Organize Evas-related dependencies (flutter-tizen#132)

swift-kim · Jul 1, 2021 · 2a30dc7 · 2a30dc7
1 parent cafd059
commit 2a30dc7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/shell/platform/tizen/BUILD.gn b/shell/platform/tizen/BUILD.gn
@@ -39,9 +39,7 @@ config("tizen_rootstrap_include_dirs") {
     "$custom_sysroot/usr/include/base",
     "$custom_sysroot/usr/include/dlog",
     "$custom_sysroot/usr/include/ecore-1",
-    "$custom_sysroot/usr/include/ecore-evas-1",
     "$custom_sysroot/usr/include/ecore-imf-1",
-    "$custom_sysroot/usr/include/ecore-imf-evas-1",
     "$custom_sysroot/usr/include/ecore-input-1",
     "$custom_sysroot/usr/include/ecore-wayland-1",
     "$custom_sysroot/usr/include/ecore-wl2-1",
@@ -50,13 +48,15 @@ config("tizen_rootstrap_include_dirs") {
     "$custom_sysroot/usr/include/eina-1/eina",
     "$custom_sysroot/usr/include/emile-1",
     "$custom_sysroot/usr/include/eo-1",
-    "$custom_sysroot/usr/include/evas-1",
     "$custom_sysroot/usr/include/feedback",
     "$custom_sysroot/usr/include/system",
     "$custom_sysroot/usr/include/wayland-extension",
+  ]
 
-    # For Evas_GL.
+  # Contain headers that the Evas_GL renderer depends on.
+  include_dirs += [
     "$custom_sysroot/usr/include/ecore-con-1",
+    "$custom_sysroot/usr/include/ecore-evas-1",
     "$custom_sysroot/usr/include/ecore-file-1",
     "$custom_sysroot/usr/include/edje-1",
     "$custom_sysroot/usr/include/eet-1",
@@ -65,6 +65,7 @@ config("tizen_rootstrap_include_dirs") {
     "$custom_sysroot/usr/include/elementary-1",
     "$custom_sysroot/usr/include/ethumb-1",
     "$custom_sysroot/usr/include/ethumb-client-1",
+    "$custom_sysroot/usr/include/evas-1",
   ]
 
   lib_dirs = [ "$custom_sysroot/usr/lib" ]
@@ -117,7 +118,6 @@ template("embedder_for_profile") {
       "ecore_imf",
       "ecore_input",
       "eina",
-      "evas",
       "EGL",
       "feedback",
       "GLESv2",
@@ -134,6 +134,7 @@ template("embedder_for_profile") {
       libs += [
         "ecore_evas",
         "elementary",
+        "evas",
       ]
 
       defines += [ "TIZEN_RENDERER_EVAS_GL" ]

diff --git a/shell/platform/tizen/channels/text_input_channel.cc b/shell/platform/tizen/channels/text_input_channel.cc
@@ -5,7 +5,6 @@
 #include "text_input_channel.h"
 
 #include <Ecore.h>
-#include <Ecore_IMF_Evas.h>
 
 #include "flutter/shell/platform/common/json_method_codec.h"
 #include "flutter/shell/platform/tizen/flutter_tizen_engine.h"