diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-16 14:59:24 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-16 14:59:24 +0000 |
| commit | f2e7dbb09fabc31fe5b16f6dc1a16593f518ca7d (patch) | |
| tree | 5e0cc6a0bf8e2b89d57c99ef54f34e26395df548 /gyp | |
| parent | 883fe7f8b13be4ae3e3f8d8f8a6d6e94d13f9392 (diff) | |
Split TLS implementation into its own translation unit.
SkTLS has it's own header separate from SkThread, and having SkThread own
the platform implementation of SkTLS is problematic with Chromium. The
simplest way to clean this up is to put the implementation in its own set
of files, where it is also more easily found.
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/19240007
git-svn-id: http://skia.googlecode.com/svn/trunk@10105 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/ports.gyp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gyp/ports.gyp b/gyp/ports.gyp index 526e92032d..2641bc9641 100644 --- a/gyp/ports.gyp +++ b/gyp/ports.gyp @@ -27,15 +27,19 @@ '../src/ports/SkFontHost_win.cpp', '../src/ports/SkFontHost_win_dw.cpp', '../src/ports/SkGlobalInitialization_default.cpp', - '../src/ports/SkPurgeableMemoryBlock_none.cpp', - '../src/ports/SkThread_win.cpp', - '../src/ports/SkMemory_malloc.cpp', '../src/ports/SkOSFile_posix.cpp', '../src/ports/SkOSFile_stdio.cpp', '../src/ports/SkOSFile_win.cpp', + '../src/ports/SkPurgeableMemoryBlock_none.cpp', + #'../src/ports/SkThread_none.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_Unix.cpp', '../src/ports/SkTime_win.cpp', + #'../src/ports/SkTLS_none.cpp', + '../src/ports/SkTLS_pthread.cpp', + '../src/ports/SkTLS_win.cpp', '../src/ports/SkXMLParser_empty.cpp', ], 'conditions': [ @@ -58,7 +62,6 @@ '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_fontconfig.cpp', '../src/ports/SkFontConfigInterface_direct.cpp', - '../src/ports/SkThread_pthread.cpp', ], }], [ 'skia_os == "nacl"', { @@ -79,7 +82,6 @@ '../src/ports/SkFontHost_FreeType.cpp', '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkFontHost_linux.cpp', - '../src/ports/SkThread_pthread.cpp', ], 'sources!': [ '../src/ports/SkDebug_stdio.cpp', @@ -99,7 +101,6 @@ # '../src/ports/SkFontHost_FreeType.cpp', # '../src/ports/SkFontHost_FreeType_common.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', - '../src/ports/SkThread_pthread.cpp', '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ @@ -115,7 +116,6 @@ 'sources': [ '../src/ports/SkFontHost_mac.cpp', '../src/ports/SkPurgeableMemoryBlock_mac.cpp', - '../src/ports/SkThread_pthread.cpp', '../src/utils/mac/SkStream_mac.cpp', ], 'sources!': [ @@ -141,8 +141,10 @@ ], 'sources!': [ # these are used everywhere but windows '../src/ports/SkDebug_stdio.cpp', - '../src/ports/SkTime_Unix.cpp', '../src/ports/SkOSFile_posix.cpp', + '../src/ports/SkThread_pthread.cpp', + '../src/ports/SkTime_Unix.cpp', + '../src/ports/SkTLS_pthread.cpp', ], }, { # else !win 'sources!': [ @@ -152,6 +154,7 @@ '../src/ports/SkOSFile_win.cpp', '../src/ports/SkThread_win.cpp', '../src/ports/SkTime_win.cpp', + '../src/ports/SkTLS_win.cpp', ], }], [ 'skia_os == "android"', { |