diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-02-10 09:40:12 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2015-03-13 08:05:07 -0400 |
| commit | 247dc6e125783b31f5c9a2cbccb34bd2ac575e6d (patch) | |
| tree | cc93cd7b4087b91d9b5af6b9b55d3afc855e5d31 | |
| parent | 130cf8ce1f3134654dd4fc809d98301a7e91dca3 (diff) | |
| download | frameworks_base-247dc6e125783b31f5c9a2cbccb34bd2ac575e6d.zip frameworks_base-247dc6e125783b31f5c9a2cbccb34bd2ac575e6d.tar.gz frameworks_base-247dc6e125783b31f5c9a2cbccb34bd2ac575e6d.tar.bz2 | |
Fix use of SkMutex.
Recent change to Skia moved SkMutex into its own header file. Include
it to use and SkMutex.
Use SK_DECLARE_STATIC_MUTEX to remove static initializer/finalizer.
Fixes master-skia build.
Change-Id: I2ab43c511587167b81310d5d55a65604d82761f5
| -rw-r--r-- | core/jni/android/graphics/AutoDecodeCancel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/AutoDecodeCancel.cpp b/core/jni/android/graphics/AutoDecodeCancel.cpp index f0739ea..0641b96 100644 --- a/core/jni/android/graphics/AutoDecodeCancel.cpp +++ b/core/jni/android/graphics/AutoDecodeCancel.cpp @@ -1,6 +1,7 @@ #include "AutoDecodeCancel.h" +#include "SkMutex.h" -static SkMutex gAutoDecoderCancelMutex; +SK_DECLARE_STATIC_MUTEX(gAutoDecoderCancelMutex); static AutoDecoderCancel* gAutoDecoderCancel; #ifdef SK_DEBUG static int gAutoDecoderCancelCount; |