diff options
| author |  reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 18:26:13 +0000 |
|---|---|---|
| committer | reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2010-12-20 18:26:13 +0000 |
| commit | f2b98d67dcb6fcb3120feede9c72016fc7b3ead8 (patch) | |
| tree | d78b57945b29865dcdeb1badbb360575289b292d /include/core/SkThread_platform.h | |
| parent | 29e5054dd07c97c2195c5f64bf67aaa6b5afa204 (diff) | |
merge with changes for GPU backend
git-svn-id: http://skia.googlecode.com/svn/trunk@637 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core/SkThread_platform.h')
| -rw-r--r-- | include/core/SkThread_platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h index c2d0348178..c6fd05804f 100644 --- a/include/core/SkThread_platform.h +++ b/include/core/SkThread_platform.h @@ -17,7 +17,7 @@ #ifndef SkThread_platform_DEFINED #define SkThread_platform_DEFINED -#ifdef ANDROID +#if defined(ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK) #include <utils/threads.h> #include <utils/Atomic.h> |