Allow Android font manager on *nix.

gyp/ports.gyp

Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index a0cfbd64da4df1c7bc3bf10d6fb4fe5e11f62e0b..ee7797a85b98bd508202f4fd5c1160f5083f7b1c 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -68,6 +68,7 @@
         '../include/ports/SkMutex_pthread.h',
         '../include/ports/SkMutex_win.h',
         '../include/ports/SkRemotableFontMgr.h',
+

[djsollen, 2015/07/15 13:48:48]

remove newline

[bungeman-skia, 2015/07/15 17:08:48]

Done.

       ],
       'sources/': [
         ['exclude', 'SkFontMgr_.+_factory\\.cpp$'],
@@ -77,29 +78,33 @@
           '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',
@@ -123,21 +128,13 @@
                 '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']],

[djsollen, 2015/07/15 13:48:48]

I've never seen this syntax before.  What does it do special that you don't get
by just having 'sources': [ '...' ]?

[bungeman-skia, 2015/07/15 17:08:48]

These '/' suffix on the key means inclusion/exclusion using regex. Since you
must have only one '_factory' (or you'll get linker errors) the most obvious way
was to list them, exclude them all above (see line 74) and then re-include
exactly one of them based on conditions. Once excluded the only way to bring
them back is to later include them, so that's what happening here. This CL isn't
really introducing this, it's just moving the existing ones around (see 220 in
the original for where this came from).

Also, as soething of a side note, gyp internally provides sources_excluded to
generators, so that IDEs can still show excluded sources. If a source is
actually removed, I don't think it will show up that way.

             }, {
               'link_settings': {
                 'libraries': [
                   '-lfontconfig',
-                  '-ldl',
                 ],
               },
               'sources': [
@@ -157,9 +154,6 @@
             '../src/ports/SkFontHost_mac.cpp',
             '../src/utils/mac/SkStream_mac.cpp',
           ],
-          'sources!': [
-            '../src/ports/SkFontHost_tables.cpp',
-          ],
         }],
         [ 'skia_os == "ios"', {
           'include_dirs': [
@@ -170,9 +164,6 @@
             '../src/ports/SkFontHost_mac.cpp',
             '../src/utils/mac/SkStream_mac.cpp',
           ],
-          'sources!': [
-            '../src/ports/SkFontHost_tables.cpp',
-          ],
         }],
         [ 'skia_os == "win"', {
           'include_dirs': [
@@ -214,12 +205,6 @@
           ],
           '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',
           ],
         }],
       ],