aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-29 14:34:58 +0000
committerGravatar chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-29 14:34:58 +0000
commitb6789115b74a17eceaa71c0e30e247bb886c12d2 (patch)
tree80ae6a93f4993713098b8ed2b06cde80cafd6f9b
parent902ebe5eb41a350b766238b3b103c22fe9fc0fb5 (diff)
Add missing gyp dependencies for debugger
git-svn-id: http://skia.googlecode.com/svn/trunk@4405 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--Makefile6
-rw-r--r--gyp/common_variables.gypi2
-rw-r--r--skia.gyp8
3 files changed, 7 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 7ad2106395..f4b459be0b 100644
--- 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 ee00a342c5..70b68fde8e 100644
--- 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 68f8cedb3b..d679eab102 100644
--- a/skia.gyp
+++ b/skia.gyp
@@ -36,14 +36,6 @@
}],
],
},
- #{
- # 'target_name': 'debugger',
- # 'type': 'none',
- # 'dependencies': [
- # 'gyp/debugger.gyp:debugger',
- # ],
-#
- # },
],
}