Update the makefile and gyp for the debugger.
Review URL: https://codereview.appspot.com/6355052

git-svn-id: http://skia.googlecode.com/svn/trunk@4410 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/skia.gyp b/skia.gyp
index d679eab..aa968ff 100644
--- a/skia.gyp
+++ b/skia.gyp
@@ -20,6 +20,7 @@
         'gyp/SampleApp.gyp:SampleApp',
         'gyp/tests.gyp:tests',
         'gyp/tools.gyp:tools',
+        'gyp/debugger.gyp:debugger',
       ],
       'conditions': [
         ['skia_os == "android"', {
@@ -28,13 +29,6 @@
           ],
         }],
       ],
-      'conditions': [
-        ['skia_debugger == "on"', {
-          'dependencies': [
-            'gyp/debugger.gyp:debugger',
-          ],
-        }],
-      ],
     },
   ],
 }