Allow Android font manager on *nix.

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 59 matching lines @@
         '../include/ports/SkRemotableFontMgr.h',
       ],
       'sources/': [
         ['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
       ],
       'conditions': [
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "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',
           ],
-        }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
           'conditions': [
-            [ 'skia_embedded_fonts', {
+            [ 'skia_os == "android"', {
+              'dependencies': [
+                 'android_deps.gyp:expat',
+              ],
+            }, {
               'link_settings': {
                 'libraries': [
                   '-ldl',
+                  '-lexpat',
                 ],
               },
+            }],
+            [ 'skia_embedded_fonts', {
               'variables': {
                 'embedded_font_data_identifier': 'sk_fonts',
                 'fonts_to_include': [
                   '../resources/fonts/Funkster.ttf',
                 ],
               },
-              'sources': [
-                '../include/ports/SkFontMgr_custom.h',
-                '../src/ports/SkFontMgr_custom.cpp',
-              ],
               'sources/': [['include', '../src/ports/SkFontMgr_custom_embedded_factory.cpp']],
               'actions': [{
                 'action_name': 'generate_embedded_font_data',
                 'inputs': [
                   '../tools/embed_resources.py',
                   '<@(fonts_to_include)',
                 ],
                 'outputs': [
                   '<(SHARED_INTERMEDIATE_DIR)/ports/fonts/fonts.cpp',
                 ],
                 'action': ['python', '../tools/embed_resources.py',
                                      '--align', '4',
                                      '--name', '<(embedded_font_data_identifier)',
                                      '--input', '<@(fonts_to_include)',
                                      '--output', '<@(_outputs)',
                 ],
                 'message': 'Generating <@(_outputs)',
                 'process_outputs_as_sources': 1,
               }],
               'defines': [
                 'SK_EMBEDDED_FONTS=<(embedded_font_data_identifier)',
               ],
             }, 'skia_no_fontconfig', {
-              'link_settings': {
-                'libraries': [
-                  '-ldl',
-                ],
-              },
-              'sources': [
-                '../include/ports/SkFontMgr_custom.h',
-                '../src/ports/SkFontMgr_custom.cpp',
-              ],
               'sources/': [['include', '../src/ports/SkFontMgr_custom_directory_factory.cpp']],
+            }, 'skia_os == "android"', {
+              'sources/': [['include', '../src/ports/SkFontMgr_android_factory.cpp']],
             }, {
               'link_settings': {
                 'libraries': [
                   '-lfontconfig',
-                  '-ldl',
                 ],
               },
               'sources': [
                 '../src/ports/SkFontMgr_fontconfig.cpp',
                 '../src/ports/SkFontHost_fontconfig.cpp',
                 '../src/ports/SkFontConfigInterface_direct.cpp',
               ],
               'sources/': [['include', '../src/ports/SkFontMgr_fontconfig_factory.cpp']],
             }]
           ],
         }],
         [ 'skia_os == "mac"', {
           'include_dirs': [
             '../include/utils/mac',
           ],
           'sources': [
             '../src/ports/SkFontHost_mac.cpp',
             '../src/utils/mac/SkStream_mac.cpp',
           ],
-          'sources!': [
-            '../src/ports/SkFontHost_tables.cpp',
-          ],
         }],
         [ 'skia_os == "ios"', {
           'include_dirs': [
             '../include/utils/ios',
             '../include/utils/mac',
           ],
           'sources': [
             '../src/ports/SkFontHost_mac.cpp',
             '../src/utils/mac/SkStream_mac.cpp',
           ],
-          'sources!': [
-            '../src/ports/SkFontHost_tables.cpp',
-          ],
         }],
         [ 'skia_os == "win"', {
           'include_dirs': [
             'config/win',
             '../src/utils/win',
           ],
           'sources!': [ # these are used everywhere but windows
             '../src/ports/SkDebug_stdio.cpp',
             '../src/ports/SkOSFile_posix.cpp',
             '../src/ports/SkTime_Unix.cpp',
@@ skipping 21 matching lines @@
             '../src/ports/SkTypeface_win_dw.cpp',
             '../src/ports/SkTypeface_win_dw.h',
           ],
         }],
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/ports/SkDebug_stdio.cpp',
           ],
           'sources': [
             '../src/ports/SkDebug_android.cpp',
-            '../src/ports/SkFontMgr_android.cpp',
-            '../src/ports/SkFontMgr_android_parser.cpp',
-          ],
-          'sources/': [['include', '../src/ports/SkFontMgr_android_factory.cpp']],
-          'dependencies': [
-             'android_deps.gyp:expat',
           ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/ports',
         ],
       },
     },
   ],
 }