Reland "Gyp file changes for the android framework."

gyp/freetype.gyp

 # Target for building freetype.
 {
   'targets': [
     {
       'target_name': 'freetype',
       'type': 'none',
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
           'direct_dependent_settings': {
             'include_dirs' : [
@@ skipping 19 matching lines @@
             'freetype_static'
           ],
           'direct_dependent_settings': {
             'defines': [
               # Both Android and NaCl provide at least FreeType 2.4.0
               'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
               'SK_CAN_USE_DLOPEN=0',
             ],
           },
         }],
+        [ 'skia_android_framework', {
+            'include_dirs': [
+              'external/expat/lib',
+              'external/freetype/include',
+            ],
+            'libraries': [
+              '-lft2',
+            ],
+            # Remove these, and use the system's freetype instead.
+            'dependencies!': [
+              'freetype_static',
+            ],
+            'export_dependent_settings!': [
+              'freetype_static',
+            ]
+        }],
       ],
     },
     {
       'target_name': 'freetype_static',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         # we are dependent upon PNG for color emoji glyphs
         'images.gyp:images'
       ],
@@ skipping 46 matching lines @@
         '../third_party/externals/freetype/src/type1/type1.c',
         '../third_party/externals/freetype/src/type42/type42.c',
         '../third_party/externals/freetype/src/winfonts/winfnt.c',
 
         '../third_party/externals/freetype/src/gzip/ftgzip.c',
         '../third_party/externals/freetype/src/lzw/ftlzw.c',
       ],
     },
   ],
 }