Scripts to generate Android.mk for framework Skia.

gyp/ports.gyp

Index: gyp/ports.gyp
diff --git a/gyp/ports.gyp b/gyp/ports.gyp
index a62791002a44e60c51e34412079ff33f73ea0e2a..f787f7498fe369fcd227b56b6e1535b59a4434be 100644
--- a/gyp/ports.gyp
+++ b/gyp/ports.gyp
@@ -59,6 +59,17 @@
             '../src/ports/SkFontHost_FreeType.cpp',
             '../src/ports/SkFontHost_FreeType_common.cpp',
           ],
+          # FIXME: This needs to be removed when skia_android_framework is set, but it is
+          # not being removed by that conditional. Instead, use a separate condition to
+          # determine whether to add it.
+          #'dependencies': [
+          #  'freetype.gyp:freetype',
+          #],
+        }],
+        # FIXME: If this dependency was being removed properly when skia_android_framework is set, this
+        # block would be unnecessary.
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos", "nacl", "android"] \
+          and skia_android_framework == 0', {
           'dependencies': [
             'freetype.gyp:freetype',
           ],
@@ -170,6 +181,20 @@
              'android_deps.gyp:expat',
           ],
         }],
+        [ 'skia_android_framework', {
+            'include_dirs': [
+              '$(TOPDIR)external/expat/lib',
+              '$(TOPDIR)external/freetype/include',
+            ],
+          # FIXME: This is not removing the dependency. Instead, we do not
+          # include it to begin with.
+          #'dependencies!':  [
+          #  'freetype.gyp:freetype',
+          #],
+          'libraries' : [
+            '-lft2',
+          ],
+        }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [