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

include/core/SkThread_platform.h

Index: include/core/SkThread_platform.h
diff --git a/include/core/SkThread_platform.h b/include/core/SkThread_platform.h
index 298e9cb16a49f6c1100c614bb69130386d2fc7ff..faad40208602bbf1fe400418952e60fbce96af44 100644
--- a/include/core/SkThread_platform.h
+++ b/include/core/SkThread_platform.h
@@ -12,7 +12,7 @@
 
 #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>
 
@@ -51,7 +51,7 @@ static inline __attribute__((always_inline)) int32_t sk_atomic_conditional_inc(i
 }
 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.
@@ -86,7 +86,7 @@ static inline __attribute__((always_inline)) void sk_membar_aquire__after_atomic
     //android_atomic_aquire_store(0, &dummy);
 }
 
-#endif // !SK_BUILD_FOR_ANDROID_NDK
+#endif // SK_BUILD_FOR_ANDROID_FRAMEWORK
 
 #else  // !SK_BUILD_FOR_ANDROID