Gyp file changes for the android framework.

gyp/common.gypi

Index: gyp/common.gypi
diff --git a/gyp/common.gypi b/gyp/common.gypi
index 2a5bbd493e216bdd6009e8c58857076c3265a8d7..48b9a6d2ef0dbc3f8f6e2676fb246d3053dbde2d 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -88,30 +88,25 @@
           ],
         },
       ],
-      [ 'skia_android_framework==0', {
-        # These defines are not used for skia_android_framework, where we build
-        # one makefile and allow someone to add SK_DEBUG etc for their own
-        # debugging purposes.
-        'configurations': {
-          'Debug': {
-            'defines': [
-              'SK_DEBUG',
-              'SK_DEVELOPER=1',
-            ],
-          },
-          'Release': {
-            'defines': [
-              'SK_RELEASE',
-            ],
-          },
-          'Release_Developer': {
-            'inherit_from': ['Release'],
-            'defines': [
-              'SK_DEVELOPER=1',
-            ],
-          },
-        },
-      }],
     ],
+    'configurations': {
+      'Debug': {
+        'defines': [
+          'SK_DEBUG',
+          'SK_DEVELOPER=1',
+        ],
+      },
+      'Release': {
+        'defines': [
+          'SK_RELEASE',
+        ],
+      },
+      'Release_Developer': {
+        'inherit_from': ['Release'],
+        'defines': [
+          'SK_DEVELOPER=1',
+        ],
+      },
+    },
   }, # end 'target_defaults'
 }