Updates to Android.mk generation.

include/core/SkUserConfig.h

Index: include/core/SkUserConfig.h
diff --git a/include/core/SkUserConfig.h b/include/core/SkUserConfig.h
index f12ab80e2988a43e0c8bf826937dabbef5c0550c..992191e0b91129b4d9ecb290c448f2782be45d41 100644
--- a/include/core/SkUserConfig.h
+++ b/include/core/SkUserConfig.h
@@ -1,4 +1,14 @@
 
+///////////////////////////////////////////////////////////////////////////////
+//
+// THIS FILE IS AUTOGENERATED BY GYP_TO_ANDROID.PY. DO NOT EDIT.
+//
+// This file contains Skia's upstream include/config/SkUserConfig.h as a
+// reference, followed by the actual defines set for Android.
+//
+///////////////////////////////////////////////////////////////////////////////
+
+
 /*
  * Copyright 2006 The Android Open Source Project
  *
@@ -37,40 +47,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-//
-// ANDROID Specific changes - NO NOT CHECK BACK INTO code.google.com/p/skia
-//
-
-// When built as part of the system image we can enable certian non-NDK compliant
-// optimizations.
-#define SK_BUILD_FOR_ANDROID_FRAMEWORK
-#define SK_FONTHOST_DOES_NOT_USE_FONTMGR
-#define SK_SUPPORT_GPU 1
-
-// temporary define until we can update the callers to the new convention
-#define SK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR
-
-// Android Text Tuning
-#define SK_GAMMA_APPLY_TO_A8
-#define SK_GAMMA_EXPONENT 1.4
-#define SK_GAMMA_CONTRAST 0.0
-
-// Optimizations for chromium (m30)
-#define GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"
-#define IGNORE_ROT_AA_RECT_OPT
-#define SKIA_IGNORE_GPU_MIPMAPS
-
-// Disable this check because it is too strict for some chromium-specific
-// subclasses of SkPixelRef. See bug: crbug.com/171776.
-#define SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK
-
-// do this build check for other tools that still read this header
-#ifdef ANDROID
-    #include <utils/misc.h>
-#endif
-
-#define SK_USE_POSIX_THREADS
-
 /*  Skia has lots of debug-only code. Often this is just null checks or other
     parameter checking, but sometimes it can be quite intrusive (e.g. check that
     each 32bit pixel is in premultiplied form). This code can be very useful
@@ -109,13 +85,8 @@
 /*  preconfig will have attempted to determine the endianness of the system,
     but you can change these mutually exclusive flags here.
  */
-#if __BYTE_ORDER == __BIG_ENDIAN
-    #define SK_CPU_BENDIAN
-    #undef  SK_CPU_LENDIAN
-#else
-    #define SK_CPU_LENDIAN
-    #undef  SK_CPU_BENDIAN
-#endif
+//#define SK_CPU_BENDIAN
+//#define SK_CPU_LENDIAN
 
 /*  Most compilers use the same bit endianness for bit flags in a byte as the
     system byte endianness, and this is the default. If for some reason this
@@ -127,12 +98,6 @@
 //#define SK_UINT8_BITFIELD_LENDIAN
 
 
-/*  Some compilers don't support long long for 64bit integers. If yours does
-    not, define this to the appropriate type.
- */
-#define SkLONGLONG int64_t
-
-
 /*  To write debug messages to a console, skia will call SkDebugf(...) following
     printf conventions (e.g. const char* format, ...). If you want to redirect
     this to something other than printf, define yours here
@@ -143,7 +108,7 @@
  *  To specify a different default font cache limit, define this. If this is
  *  undefined, skia will use a built-in value.
  */
-#define SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)
+//#define SK_DEFAULT_FONT_CACHE_LIMIT   (1024 * 1024)
 
 /*
  *  To specify the default size of the image cache, undefine this and set it to
@@ -167,7 +132,7 @@
 
 /*  Define this to provide font subsetter in PDF generation.
  */
-#define SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"
+//#define SK_SFNTLY_SUBSETTER "sfntly/subsetter/font_subsetter.h"
 
 /*  Define this to set the upper limit for text to support LCD. Values that
     are very large increase the cost in the font cache and draw slower, without
@@ -184,18 +149,6 @@
 //#define SK_SUPPORT_UNITTEST
 #endif
 
-/* If your system embeds skia and has complex event logging, define this
-   symbol to name a file that maps the following macros to your system's
-   equivalents:
-       SK_TRACE_EVENT0(event)
-       SK_TRACE_EVENT1(event, name1, value1)
-       SK_TRACE_EVENT2(event, name1, value1, name2, value2)
-   src/utils/SkDebugTrace.h has a trivial implementation that writes to
-   the debug output stream. If SK_USER_TRACE_INCLUDE_FILE is not defined,
-   SkTrace.h will define the above three macros to do nothing.
-*/
-//#undef SK_USER_TRACE_INCLUDE_FILE
-
 /*  Change the ordering to work in X windows.
  */
 #ifdef SK_SAMPLES_FOR_X
@@ -231,9 +184,54 @@
  *
  * See SkThread.h for documentation on what these includes must contain.
  */
-#define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"
-#define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"
+//#define SK_ATOMICS_PLATFORM_H "SkAtomics_xxx.h"
+//#define SK_MUTEX_PLATFORM_H "SkMutex_xxx.h"
 
-#define SK_SCALAR_IS_FLOAT
+#endif
+
+// Android defines:
+#ifndef SkUserConfig_Android_DEFINED
+#define SkUserConfig_Android_DEFINED
+#ifdef ANDROID
+	#include <utils/misc.h>
+#endif
 
+#if __BYTE_ORDER == __BIG_ENDIAN
+	#define SK_CPU_BENDIAN
+	#undef  SK_CPU_LENDIAN
+#else
+	#define SK_CPU_LENDIAN
+	#undef  SK_CPU_BENDIAN
 #endif
+
+#define SK_GAMMA_SRGB
+#define SK_GAMMA_APPLY_TO_A8
+#define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 0
+#define SK_SUPPORT_GPU 1
+#define SK_SUPPORT_OPENCL 0
+#define SK_FORCE_DISTANCEFIELD_FONTS 0
+#define SK_SCALAR_IS_FLOAT
+#define SK_CAN_USE_FLOAT
+#define DCT_IFAST_SUPPORTED
+#define SK_USE_FREETYPE_EMBOLDEN
+#define SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400
+#define SK_CAN_USE_DLOPEN 0
+#define SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"
+#define SK_BUILD_FOR_ANDROID_FRAMEWORK
+#define SK_GAMMA_EXPONENT 1.4
+#define SK_GAMMA_CONTRAST 0.0
+#define GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"
+#define IGNORE_ROT_AA_RECT_OPT
+#define SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK
+#define SkLONGLONG int64_t
+#define SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)
+#define SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"
+#define SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"
+#define SK_BUILD_FOR_ANDROID
+#define SK_FONTHOST_DOES_NOT_USE_FONTMGR
+#define SK_USE_POSIX_THREADS
+#define SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400
+#define SK_CAN_USE_DLOPEN 0
+#define SK_SUPPORT_PDF
+
+#endif // SkUserConfig_Android_DEFINED