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/Makefile b/Makefile
index f4b459b..34f935b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,19 +29,15 @@
 
 BUILDTYPE ?= Debug
 CWD := $(shell pwd)
-ALL_TARGETS := core SampleApp bench gm tests tools
+ALL_TARGETS := core SampleApp bench gm tests tools debugger
 
 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
+default: core SampleApp bench gm tests tools
 
 # As noted in http://code.google.com/p/skia/issues/detail?id=330 , building
 # multiple targets in parallel was failing.  The special .NOTPARALLEL target

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 70b68fd..ee00a34 100644 (file)
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -66,7 +66,6 @@
       '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,
@@ -79,7 +78,6 @@
     '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/gyp/debugger.gyp b/gyp/debugger.gyp
index 0789a96..33b0932 100644 (file)
--- a/gyp/debugger.gyp
+++ b/gyp/debugger.gyp
@@ -54,6 +54,9 @@
             ],
           },
         }],
+        [ 'skia_os == "mac" and skia_arch_width != 64', {
+          'error': '<!(skia_arch_width must be 64 bits when building the debugger on mac'
+        }],
         [ 'skia_os == "mac"', {
           'mac_bundle' : 1,
           'include_dirs': [

diff --git a/skia.gyp b/skia.gyp
index d679eab..aa968ff 100644 (file)
--- 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',
-          ],
-        }],
-      ],
     },
   ],
 }