Some further tweaks for Tizen support

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index ba892cd..1e1c5e7 100644 (file)
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -21,9 +21,15 @@ declare_args() {
       cxx = "$ndk/toolchains/llvm/prebuilt/$ndk_host/bin/clang++"
     }
   } else if (is_tizen) {
-    ar = "$ncli/tools/$ncli_gccdir/$ncli_target/bin/ar"
-    cc = "$ncli/tools/llvm-4.0.0/bin/clang"
-    cxx = "$ncli/tools/llvm-4.0.0/bin/clang++"
+    if (host_os == "win") {
+      ar = "$ncli/tools/$ncli_gccdir/$ncli_target/bin/ar.exe"
+      cc = "$ncli/tools/llvm-4.0.0/bin/clang.exe"
+      cxx = "$ncli/tools/llvm-4.0.0/bin/clang++.exe"
+    } else {
+      ar = "$ncli/tools/$ncli_gccdir/$ncli_target/bin/ar"
+      cc = "$ncli/tools/llvm-4.0.0/bin/clang"
+      cxx = "$ncli/tools/llvm-4.0.0/bin/clang++"
+    }
   }
 
   msvc = 2017

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 717a7db..e97bc67 100644 (file)
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -478,7 +478,7 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
 
     fGpuTracingSupport = ctxInfo.hasExtension("GL_EXT_debug_marker");
 
-#ifdef OS_TIZEN
+#ifdef SK_BUILD_FOR_TIZEN
     fReuseScratchTextures = true;
 #else
     // Disable scratch texture reuse on Mali and Adreno devices

diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index 9c91eb8..82ea456 100644 (file)
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -692,7 +692,7 @@ protected:
         FcResult result;
         // Set an arbitrary limit on the number of pattern object values to consider.
         // TODO: re-write this to avoid N*M
-#ifdef OS_TIZEN
+#ifdef SK_BUILD_FOR_TIZEN
         // Tizen fonts have a lot of names...
         static const int maxId = 256;
 #else

diff --git a/third_party/freetype2/BUILD.gn b/third_party/freetype2/BUILD.gn
index 7ccaa1d..cae6890 100644 (file)
--- a/third_party/freetype2/BUILD.gn
+++ b/third_party/freetype2/BUILD.gn
@@ -13,7 +13,7 @@ import("../third_party.gni")
 
 if (skia_use_system_freetype2) {
   system("freetype2") {
-    include_dirs = [ "/usr/include/freetype2" ]
+    cflags = [ "-I=/usr/include/freetype2" ]
     libs = [ "freetype" ]
   }
 } else {