[Chromium] Make the v8 i18n API dependency conditional for Android, disable strict...
authorpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jul 2012 18:45:16 +0000 (18:45 +0000)
committerpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Jul 2012 18:45:16 +0000 (18:45 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@122610 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp

index 35eed38..441aa96 100644 (file)
@@ -1,3 +1,17 @@
+2012-07-13  Peter Beverloo  <peter@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  <haraken@chromium.org>
 
         [CallWith=XXX] arguments should be placed at the head of method arguments
index 0db1b5a..c274e2f 100644 (file)
       ],
       '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.
             ['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?)$']]
         }],