commit 7a223f5825db96d6499523872ea32d5dba8d2667
author halcanary <halcanary@google.com> Mon May 09 08:00:26 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon May 09 08:00:26 2016 -0700
tree 6916cdd6c9d994cccc617d549d7d8e4332fa8c96
parent a8966a8a34f32bf3bb1dd2f9b6a77cdb1ebe1809

DEPS: update icu + sfntly

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1960153002

Review-Url: https://codereview.chromium.org/1960153002

gyp/sfntly.gyp

diff --git a/gyp/sfntly.gyp b/gyp/sfntly.gyp
index b23a7db..0704ba1 100644
--- a/gyp/sfntly.gyp
+++ b/gyp/sfntly.gyp
@@ -11,7 +11,7 @@
         'common_variables.gypi',
       ],
       'variables': {
-        'sfntly_src_path': '../third_party/externals/sfntly',
+        'sfntly_src_path': '../third_party/externals/sfntly/cpp/src',
       },
       'direct_dependent_settings': {
         'include_dirs': [ '<(sfntly_src_path)/sample/chromium', ],
@@ -22,7 +22,7 @@
       'sources': [
         '<(sfntly_src_path)/sample/chromium/font_subsetter.cc',
         '<(sfntly_src_path)/sample/chromium/subsetter_impl.cc',
-        '<!@(python find.py ../third_party/externals/sfntly/sfntly "*.c*")'
+        '<!@(python find.py "<(sfntly_src_path)/sfntly" "*.c*")'
       ],
       'include_dirs': [
         '<(sfntly_src_path)',
@@ -36,7 +36,7 @@
       'conditions': [
         [ 'skia_os == "win"',
           {
-            'defines': [ 'WIN32', ],
+            'defines': [ 'WIN32', 'NOMINMAX', ],
             'msvs_settings': {
               'VCCLCompilerTool': {
                 'AdditionalOptions': [ '/EHsc' ],