Reland "Gyp file changes for the android framework."

gyp/android_deps.gyp

Index: gyp/android_deps.gyp
diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index cd5b1b0c693c483850957c936265cfbec5aaafc7..1669b2bdad1704164362e8f62307b03a0ee6c797 100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -14,7 +14,68 @@
 # This is due to the fact that we cannot use variables in an includes as the
 # variable expansion step for gyp happens after the includes are processed.
 {
-  'includes': [
-    '../platform_tools/android/gyp/dependencies.gypi',
+  'conditions': [
+    [ 'skia_android_framework == 0',
+      {
+        'includes': [
+          '../platform_tools/android/gyp/dependencies.gypi',
+        ],
+      }, { # else skia_android_framework
+        'cflags': [
+          '-Wno-error'
+        ],
+        'targets': [
+          {
+            'target_name': 'expat',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lexpat',
+              ],
+            },
+          },
+          {
+            'target_name': 'gif',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                'libgif.a',
+              ],
+              'include_dirs': [
+                'external/giflib',
+              ],
+            },
+          },
+          {
+            'target_name': 'png',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-lpng',
+              ],
+              'include_dirs': [
+                'external/libpng',
+              ],
+            },
+          },
+          {
+            'target_name': 'jpeg',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                '-ljpeg',
+              ],
+              'include_dirs': [
+                'external/jpeg',
+              ],
+            },
+          },
+          {
+            'target_name': 'cpu_features',
+            'type': 'none',
+          },
+        ],
+      }
+    ],
   ],
 }