Reland "Gyp file changes for the android framework."

Relands https://codereview.chromium.org/153093003/, which was reverted
with https://skia.googlesource.com/skia.git/+/eb6295044b97db05ec40625dcebc2459b2a38a98

This reverts commit 6b32be1402eb6c549d5ba1db71860e24f9de2991.

BUG=skia:1975
R=djsollen@google.com

Review URL: https://codereview.chromium.org/154053002

git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@13321 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 24 insertions, 19 deletions

diff --git a/common.gypi b/common.gypi
index 48b9a6d..2a5bbd4 100644
--- a/common.gypi
+++ b/common.gypi
@@ -88,25 +88,30 @@
           ],
         },
       ],
+      [ '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'
 }