Remove building_for_tizen and unnecessary cflag setting

diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index 353355ce64bc4a5f53d9af17aa58ae5d20d75fec..de79aed36c8eab814b749b5df52a4fd2a78798e1 100644 (file)
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -19,7 +19,6 @@ declare_args() {
   linux_soname_version = ""
   sanitize = ""
 
-  building_for_tizen = false
   ncli = ""
   ncli_version = "4.0"
 }
@@ -45,11 +44,11 @@ is_fuchsia = current_os == "fuchsia"
 is_ios = current_os == "ios" || current_os == "tvos" || current_os == "watchos"
 is_tvos = current_os == "tvos"
 is_watchos = current_os == "watchos"
-is_linux = current_os == "linux"
+is_linux = current_os == "linux" || current_os == "tizen"
 is_mac = current_os == "mac"
 is_win = current_os == "win" || current_os == "winrt"
 is_winrt = current_os == "winrt"
-is_tizen = building_for_tizen
+is_tizen = current_os == "tizen"
 
 if (target_cpu == "") {
   target_cpu = host_cpu

diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn
index 43f27a6f4490a60d84b1f5fa647a9e67a8437bfb..a777579e2062a14819c4015881517656c497a0a0 100644 (file)
--- a/third_party/freetype2/BUILD.gn
+++ b/third_party/freetype2/BUILD.gn
@@ -12,17 +12,10 @@ declare_args() {
 import("../third_party.gni")
 
 if (skia_use_system_freetype2) {
-  if (is_tizen) {
-    system("freetype2") {
-      cflags = [ "-I=/usr/include/freetype2" ]
-      libs = [ "freetype" ]
-    }
-  } else {
     system("freetype2") {
       include_dirs = [ "/usr/include/freetype2" ]
       libs = [ "freetype" ]
     }
-  }
 } else {
   third_party("freetype2") {
     public_defines = [ "SK_FREETYPE_MINIMUM_RUNTIME_VERSION=(((FREETYPE_MAJOR) << 24) | ((FREETYPE_MINOR) << 16) | ((FREETYPE_PATCH) << 8))" ]