Add missing gyp dependencies for debugger

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

diff --git a/Makefile b/Makefile
index 7ad2106..f4b459b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,10 @@ ifneq (,$(findstring skia_os=android, $(GYP_DEFINES)))
   ALL_TARGETS += SkiaAndroidApp
 endif
 
+ifneq (,$(findstring skia_debugger=on, $(GYP_DEFINES)))
+  ALL_TARGETS += debugger
+endif
+
 # Default target.  This must be listed before all other targets.
 .PHONY: default
 default: all
@@ -101,4 +105,4 @@ else ifneq (,$(findstring Darwin, $(uname)))
 else
        echo "unknown platform $(uname)"
        exit 1
-endif
\ No newline at end of file
+endif

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index ee00a34..70b68fd 100644 (file)
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -66,6 +66,7 @@
       'skia_angle%': 0,
       'skia_arch_type%': 'x86',
       'skia_arch_width%': 32,
+      'skia_debugger%': 'off',
     },
 
     # Re-define all variables defined within the level-2 'variables' dict,
@@ -78,6 +79,7 @@
     'skia_angle%': '<(skia_angle)',
     'skia_arch_type%': '<(skia_arch_type)',
     'skia_arch_width%': '<(skia_arch_width)',
+    'skia_debugger%': '<(skia_debugger)',
   },
 }
 # Local Variables:

diff --git a/skia.gyp b/skia.gyp
index 68f8ced..d679eab 100644 (file)
--- a/skia.gyp
+++ b/skia.gyp
@@ -36,14 +36,6 @@
         }],
       ],
     },
-    #{
-    #  'target_name': 'debugger',
-    #  'type': 'none',
-    #  'dependencies': [
-    #    'gyp/debugger.gyp:debugger',
-    #  ],
-#
- #   },
   ],
 }