diff options
| author | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 21:40:16 +0000 |
|---|---|---|
| committer | bajones@chromium.org <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-18 21:40:16 +0000 |
| commit | 0146dd0ce5b859994bd352bff8e19119e01534b9 (patch) | |
| tree | 421fa5bd10dbdbc6bd4230a5b8e8b04bf266dfef /skia/skia_library.gypi | |
| parent | 3c772405deec15583a47f160b36436a177ec4afa (diff) | |
| download | chromium_src-0146dd0ce5b859994bd352bff8e19119e01534b9.zip chromium_src-0146dd0ce5b859994bd352bff8e19119e01534b9.tar.gz chromium_src-0146dd0ce5b859994bd352bff8e19119e01534b9.tar.bz2 | |
Updated Khronos GLES2 headers.
There was a type conflict between the previous, out of date headers and the more
recent ones included in ANGLE that was causing failures on 64-bit Windows.
BUG=326382
R=kbr@chromium.org, piman@chromium.org, raymes@chromium.org
TBR=robertphillips@google.com
Review URL: https://codereview.chromium.org/99053007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/skia_library.gypi')
| -rw-r--r-- | skia/skia_library.gypi | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 229f73f..02fa247 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -54,8 +54,6 @@ '../third_party/skia/src/ports/SkOSFile_posix.cpp', '../third_party/skia/src/ports/SkOSFile_stdio.cpp', '../third_party/skia/src/ports/SkOSFile_win.cpp', - '../third_party/skia/src/ports/SkThread_pthread.cpp', - '../third_party/skia/src/ports/SkThread_win.cpp', '../third_party/skia/src/ports/SkTime_Unix.cpp', '../third_party/skia/src/ports/SkTLS_pthread.cpp', '../third_party/skia/src/ports/SkTLS_win.cpp', @@ -270,7 +268,6 @@ [ 'OS == "win"', { 'sources!': [ '../third_party/skia/src/ports/SkOSFile_posix.cpp', - '../third_party/skia/src/ports/SkThread_pthread.cpp', '../third_party/skia/src/ports/SkTime_Unix.cpp', '../third_party/skia/src/ports/SkTLS_pthread.cpp', ], |