Modified: trunk/Source/WebKit/chromium/ChangeLog (88432 => 88433)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-09 07:35:28 UTC (rev 88432)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-09 07:42:53 UTC (rev 88433)
@@ -1,3 +1,9 @@
+2011-06-09 James Robinson <[email protected]>
+
+ Fix chromium build on build.webkit.org builders.
+
+ * features.gypi:
+
2011-06-08 Justin Novosad <[email protected]>
Reviewed by James Robinson.
Modified: trunk/Source/WebKit/chromium/features.gypi (88432 => 88433)
--- trunk/Source/WebKit/chromium/features.gypi 2011-06-09 07:35:28 UTC (rev 88432)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-06-09 07:42:53 UTC (rev 88433)
@@ -32,6 +32,10 @@
# The following defines turn webkit features on and off.
'variables': {
'variables': {
+ 'variables': {
+ 'enable_register_protocol_handler%': 0,
+ },
+ 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
# We have to nest variables inside variables as a hack for variables
# override.
@@ -107,21 +111,19 @@
'use_accelerated_compositing%': 1,
'enable_svg%': 1,
- 'enable_register_protocol_handler%': 0,
+ 'conditions': [
+ ['enable_register_protocol_handler==1', {
+ 'feature_defines': [
+ 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
+ ]
+ }],
+ ],
},
'feature_defines%': '<(feature_defines)',
'use_accelerated_compositing%': '<(use_accelerated_compositing)',
'enable_svg%': '<(enable_svg)',
'enable_register_protocol_handler%': '<(enable_register_protocol_handler)',
-
- 'conditions': [
- ['enable_register_protocol_handler==1', {
- 'feature_defines': [
- 'ENABLE_REGISTER_PROTOCOL_HANDLER=1',
- ]
- }],
- ],
},
}
