Title: [122610] trunk/Source/WebCore
- Revision
- 122610
- Author
- pe...@chromium.org
- Date
- 2012-07-13 11:45:16 -0700 (Fri, 13 Jul 2012)
Log Message
[Chromium] Make the v8 i18n API dependency conditional for Android, disable strict aliasing
https://bugs.webkit.org/show_bug.cgi?id=91240
Reviewed by Adam Barth.
Disable the v8 internationalization API for Chromium Android, as it's
disabled and not always available in checkouts. Furthermore, disable
strict aliasing for the webkit_remaining target, similar to what
x11-based builds are doing (see the webcore_prerequisites target).
* WebCore.gyp/WebCore.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (122609 => 122610)
--- trunk/Source/WebCore/ChangeLog 2012-07-13 18:43:19 UTC (rev 122609)
+++ trunk/Source/WebCore/ChangeLog 2012-07-13 18:45:16 UTC (rev 122610)
@@ -1,3 +1,17 @@
+2012-07-13 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Make the v8 i18n API dependency conditional for Android, disable strict aliasing
+ https://bugs.webkit.org/show_bug.cgi?id=91240
+
+ Reviewed by Adam Barth.
+
+ Disable the v8 internationalization API for Chromium Android, as it's
+ disabled and not always available in checkouts. Furthermore, disable
+ strict aliasing for the webkit_remaining target, similar to what
+ x11-based builds are doing (see the webcore_prerequisites target).
+
+ * WebCore.gyp/WebCore.gyp:
+
2012-07-13 Kentaro Hara <hara...@chromium.org>
[CallWith=XXX] arguments should be placed at the head of method arguments
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (122609 => 122610)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-07-13 18:43:19 UTC (rev 122609)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-07-13 18:45:16 UTC (rev 122610)
@@ -1892,7 +1892,6 @@
],
'dependencies': [
'webcore_prerequisites',
- '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
],
# This is needed for mac because of webkit_system_interface. It'd be nice
# if this hard dependency could be split off the rest.
@@ -2027,6 +2026,20 @@
['exclude', 'Gtk\\.cpp$'],
],
}],
+ ['OS=="android"', {
+ 'cflags': [
+ # WebCore does not work with strict aliasing enabled.
+ # https://bugs.webkit.org/show_bug.cgi?id=25864
+ '-fno-strict-aliasing',
+ ],
+ }, { # OS!="android"
+ 'dependencies': [
+ # Android doesn't have this third party repository, so can't
+ # include it. It's not used by Android in any case.
+ '<(chromium_src_dir)/third_party/v8-i18n/build/all.gyp:v8-i18n',
+ ],
+ 'sources/': [['exclude', 'Android\\.cpp$']]
+ }],
['OS!="mac"', {
'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
}],
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes