Updates to Android.mk generation.

gyp/common_conditions.gypi

 # conditions used in both common.gypi and skia.gyp in chromium
 #
 {
   'defines': [
     'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
     'SK_SUPPORT_GPU=<(skia_gpu)',
     'SK_SUPPORT_OPENCL=<(skia_opencl)',
     'SK_FORCE_DISTANCEFIELD_FONTS=<(skia_force_distancefield_fonts)',
   ],
   'conditions' : [
@@ skipping 235 matching lines @@
       'cflags_cc!': [
         '-fno-rtti',
         '-Wnon-virtual-dtor',
       ],
       'defines': [
         'DCT_IFAST_SUPPORTED',
         # using freetype's embolden allows us to adjust fake bold settings at
         # draw-time, at which point we know which SkTypeface is being drawn
         'SK_USE_FREETYPE_EMBOLDEN',
         # Android provides at least FreeType 2.4.0 at runtime.
-        'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
+        'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400',
         # Skia should not use dlopen on Android.
-        'SK_CAN_USE_DLOPEN=0',
+        'SK_CAN_USE_DLOPEN 0',
+        'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
+        # When built as part of the system image we can enable certian non-NDK
+        # compliant optimizations.
+        'SK_BUILD_FOR_ANDROID_FRAMEWORK',
+        # Android Text Tuning
+        'SK_GAMMA_APPLY_TO_A8',
+        'SK_GAMMA_EXPONENT 1.4',
+        'SK_GAMMA_CONTRAST 0.0',
+        # Optimizations for chromium (m30)
+        'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
+        'IGNORE_ROT_AA_RECT_OPT',
+        # Disable this check because it is too strict for some chromium-specific
+        # subclasses of SkPixelRef. See bug: crbug.com/171776.
+        'SK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK',
+        'SkLONGLONG int64_t',
+        'SK_DEFAULT_FONT_CACHE_LIMIT   (768 * 1024)',
+        'SK_ATOMICS_PLATFORM_H "../../src/ports/SkAtomics_android.h"',
+        'SK_MUTEX_PLATFORM_H "../../src/ports/SkMutex_pthread.h"',
       ],
     }],
 
     [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos"]',
       {
         'defines': [
           'SK_SAMPLES_FOR_X',
           'SK_BUILD_FOR_UNIX',
         ],
         'configurations': {
@@ skipping 286 matching lines @@
       'defines': [
         'SK_USE_POSIX_THREADS',
       ],
     }],
   ], # end 'conditions'
   # The Xcode SYMROOT must be at the root. See build/common.gypi in chromium for more details
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }