diff options
author | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 13:42:17 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 13:42:17 +0000 |
commit | f6eed389769b4d0eb3ab9385e7b8500fbac5634a (patch) | |
tree | 4dc618b2da1789880e6175d3585f6e84842c5eaf /skia | |
parent | 8b10ba22f0cdb360bde728fa9ba556af21f244c1 (diff) | |
download | chromium_src-f6eed389769b4d0eb3ab9385e7b8500fbac5634a.zip chromium_src-f6eed389769b4d0eb3ab9385e7b8500fbac5634a.tar.gz chromium_src-f6eed389769b4d0eb3ab9385e7b8500fbac5634a.tar.bz2 |
Roll Skia DEPS to 10117
R=bsalomon@google.com
Review URL: https://codereview.chromium.org/19554003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
-rw-r--r-- | skia/skia.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/skia/skia.gyp b/skia/skia.gyp index 486c72a..8f5d2bf 100644 --- a/skia/skia.gyp +++ b/skia/skia.gyp @@ -116,7 +116,9 @@ '../third_party/skia/src/ports/SkOSFile_win.cpp', #'../third_party/skia/src/ports/SkThread_none.cpp', '../third_party/skia/src/ports/SkThread_pthread.cpp', + '../third_party/skia/src/ports/SkTLS_pthread.cpp', '../third_party/skia/src/ports/SkThread_win.cpp', + '../third_party/skia/src/ports/SkTLS_win.cpp', '../third_party/skia/src/ports/SkTime_Unix.cpp', #'../third_party/skia/src/ports/SkXMLParser_empty.cpp', #'../third_party/skia/src/ports/SkXMLParser_expat.cpp', @@ -519,6 +521,7 @@ 'sources!': [ '../third_party/skia/src/ports/SkOSFile_posix.cpp', '../third_party/skia/src/ports/SkThread_pthread.cpp', + '../third_party/skia/src/ports/SkTLS_pthread.cpp', '../third_party/skia/src/ports/SkTime_Unix.cpp', 'ext/SkThread_chrome.cc', ], |