refactor android defines to implicitly assume NDK compliance unless it is explicitly marked as bein…

include/core/SkThread_platform.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkThread_platform_DEFINED
 #define SkThread_platform_DEFINED
 
 #if defined(SK_BUILD_FOR_ANDROID)
 
-#if defined(SK_BUILD_FOR_ANDROID_NDK)
+#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)

[borenet, 2013/03/13 12:08:19]

I understand the desire to make as small a modification as possible, but I tend
to prefer non-inverted logic when using both cases, ie moving the
SK_BUILD_FOR_ANDROID_FRAMEWORK code up here and the 
!defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) code down.  I'll leave that up to you
though.

[djsollen, 2013/03/13 12:26:41]

I thought of doing that as well, but it makes the #ifdef block huge.  Also, this
code is already pseudo-deprecated and can be deleted when android launches their
own font manager.

[borenet, 2013/03/13 12:42:12]

SGTM

 
 #include <stdint.h>
 
 /* Just use the GCC atomic intrinsics. They're supported by the NDK toolchain,
  * have reasonable performance, and provide full memory barriers
  */
 static inline __attribute__((always_inline)) int32_t sk_atomic_inc(int32_t *addr) {
     return __sync_fetch_and_add(addr, 1);
 }
 
@@ skipping 18 matching lines @@
 
         if (before == value) {
             return value;
         } else {
             value = before;
         }
     }
 }
 static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_conditional_inc() { }
 
-#else // !SK_BUILD_FOR_ANDROID_NDK
+#else // SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 /* The platform atomics operations are slightly more efficient than the
  * GCC built-ins, so use them.
  */
 #include <utils/Atomic.h>
 
 #define sk_atomic_inc(addr)         android_atomic_inc(addr)
 #define sk_atomic_add(addr, inc)    android_atomic_add(inc, addr)
 #define sk_atomic_dec(addr)         android_atomic_dec(addr)
 
@@ skipping 14 matching lines @@
         }
     }
 }
 static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic_conditional_inc() {
     //HACK: Android is actually using full memory barriers.
     //      Should this change, uncomment below.
     //int dummy;
     //android_atomic_aquire_store(0, &dummy);
 }
 
-#endif // !SK_BUILD_FOR_ANDROID_NDK
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 #else  // !SK_BUILD_FOR_ANDROID
 
 /** Implemented by the porting layer, this function adds one to the int
     specified by the address (in a thread-safe manner), and returns the
     previous value.
     No additional memory barrier is required.
     This must act as a compiler barrier.
 */
 SK_API int32_t sk_atomic_inc(int32_t* addr);
@@ skipping 88 matching lines @@
 typedef SkMutex SkBaseMutex;
 
 #define SK_DECLARE_STATIC_MUTEX(name)           static SkBaseMutex  name
 #define SK_DECLARE_GLOBAL_MUTEX(name)           SkBaseMutex  name
 #define SK_DECLARE_MUTEX_ARRAY(name, count)     SkBaseMutex name[count]
 
 #endif // !SK_USE_POSIX_THREADS
 
 
 #endif