AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DEPS: update icu + sfntly

Browse Source 
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
This commit is contained in:
halcanary 2016-05-09 08:00:26 -07:00 committed by Commit bot
parent a8966a8a34
commit 7a223f5825
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -36,9 +36,9 @@ deps = {
#"third_party/externals/v8": "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
# sfntly is used by the PDF backend for font subsetting
"third_party/externals/sfntly" : "https://chromium.googlesource.com/external/sfntly/cpp/src.git@1bdaae8fc788a5ac8936d68bf24f37d977a13dac",
"third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@130f832eddf98467e6578b548cb74ce17d04a26d",
# ICU is needed for sfntly.
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@ce41627e388fb46ab49671bd16a5db81dcd75a71",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@c291cde264469b20ca969ce8832088acb21e0c48",
# sdl will be needed for native windows
"third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9b526d28cb2d7f0ccff0613c94bb52abc8f53b6f",

6
gyp/sfntly.gyp
View File

@ -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' ],