Fix broken Android framework build.

gyp/ports.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Port-specific Skia library code.
 {
   'targets': [
     {
       'target_name': 'ports',
       'product_name': 'skia_ports',
@@ skipping 68 matching lines @@
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android"]', {
           'sources': [
             '../src/ports/SkFontHost_FreeType.cpp',
             '../src/ports/SkFontHost_FreeType_common.cpp',
             '../src/ports/SkFontMgr_android.cpp',
             '../src/ports/SkFontMgr_android_parser.cpp',
             '../src/ports/SkFontMgr_custom.cpp',
           ],
           'dependencies': [
             'freetype.gyp:freetype',
+            'expat.gyp:expat',
           ],
           'conditions': [
-            [ 'skia_android_framework', {
-              'link_settings': { 'libraries': [ '-lexpat' ] },
-            }, {
+            [ 'skia_android_framework == 0', {
               'link_settings': { 'libraries': [ '-ldl' ] },
-              'dependencies': [ 'expat.gyp:expat' ],
             }],
             [ 'skia_embedded_fonts', {
               'variables': {
                 'embedded_font_data_identifier': 'sk_fonts',
                 'fonts_to_include': [
                   '../resources/fonts/Funkster.ttf',
                 ],
               },
               'sources/': [['include', '../src/ports/SkFontMgr_custom_embedded_factory.cpp']],
               'actions': [{
@@ skipping 111 matching lines @@
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/ports',
         ],
       },
     },
   ],
 }