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

include/core/SkPreConfig.h

Index: include/core/SkPreConfig.h
diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h
index 4f977ead9a72cbc4c69576e6cbe1f075fdb9aebe..23b569442181e0ac04d126191eb4ecee1614e4d8 100644
--- a/include/core/SkPreConfig.h
+++ b/include/core/SkPreConfig.h
@@ -16,7 +16,7 @@
 
 //////////////////////////////////////////////////////////////////////
 
-#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_ANDROID_NDK) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) && !defined(SK_BUILD_FOR_NACL)
+#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_PALM) && !defined(SK_BUILD_FOR_WINCE) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_SDL) && !defined(SK_BUILD_FOR_BREW) && !defined(SK_BUILD_FOR_NACL)
 
     #ifdef __APPLE__
         #include "TargetConditionals.h"
@@ -30,8 +30,6 @@
         #define SK_BUILD_FOR_WIN32
     #elif defined(__SYMBIAN32__)
         #define SK_BUILD_FOR_WIN32
-    #elif defined(ANDROID_NDK)
-        #define SK_BUILD_FOR_ANDROID_NDK
     #elif defined(ANDROID)
         #define SK_BUILD_FOR_ANDROID
     #elif defined(linux) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
@@ -46,15 +44,16 @@
 
 #endif
 
-/* Even if the user only defined the NDK variant we still need to build
- * the default Android code. Therefore, when attempting to include/exclude
- * something from the NDK variant check first that we are building for
- * Android then check the status of the NDK define.
+/* Even if the user only defined the framework variant we still need to build
+ * the default (NDK-compliant) Android code. Therefore, when attempting to
+ * include/exclude something from the framework variant check first that we are
+ * building for Android then check the status of the framework define.
  */
-#if defined(SK_BUILD_FOR_ANDROID_NDK) && !defined(SK_BUILD_FOR_ANDROID)
+#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) && !defined(SK_BUILD_FOR_ANDROID)

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

Where is SK_BUILD_FOR_ANDROID_FRAMEWORK defined? I don't see it in the gyp file.

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

It isn't defined because we aren't able to build the framework version since it
is not NDK compliant.

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

Per our live discussion, it's defined by headers in the framework, rather than
by any conditions in our gyp files.

     #define SK_BUILD_FOR_ANDROID
 #endif
 
+
 // USE_CHROMIUM_SKIA is defined when building Skia for the Chromium
 // browser.
 #if defined(USE_CHROMIUM_SKIA)