Title: [121028] trunk
Revision
121028
Author
[email protected]
Date
2012-06-22 09:20:33 -0700 (Fri, 22 Jun 2012)

Log Message

[Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
https://bugs.webkit.org/show_bug.cgi?id=88853

Reviewed by Steve Block.

The Android exclusions were necessary to fix a gyp generation error, as
the gcc_version variable wasn't being defined for Android. Remove these
exceptions when Chromium is able to define the gcc_version variable.

Source/_javascript_Core:

* _javascript_Core.gyp/_javascript_Core.gyp:

Source/WebCore:

* WebCore.gyp/WebCore.gyp:

Source/WebKit/chromium:

* WebKit.gyp:
* WebKitUnitTests.gyp:

Source/WTF:

* WTF.gyp/WTF.gyp:

Tools:

* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (121027 => 121028)


--- trunk/Source/_javascript_Core/ChangeLog	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1,3 +1,16 @@
+2012-06-22  Peter Beverloo  <[email protected]>
+
+        [Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88853
+
+        Reviewed by Steve Block.
+
+        The Android exclusions were necessary to fix a gyp generation error, as
+        the gcc_version variable wasn't being defined for Android. Remove these
+        exceptions when Chromium is able to define the gcc_version variable.
+
+        * _javascript_Core.gyp/_javascript_Core.gyp:
+
 2012-06-21  Filip Pizlo  <[email protected]>
 
         op_resolve_global should not prevent DFG inlining

Modified: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (121027 => 121028)


--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -47,7 +47,7 @@
     ],
   },
   'conditions': [
-    ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version==46', {
+    ['os_posix == 1 and OS != "mac" and gcc_version==46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
         # with upcoming c++0x types.

Modified: trunk/Source/WTF/ChangeLog (121027 => 121028)


--- trunk/Source/WTF/ChangeLog	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WTF/ChangeLog	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1,3 +1,16 @@
+2012-06-22  Peter Beverloo  <[email protected]>
+
+        [Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88853
+
+        Reviewed by Steve Block.
+
+        The Android exclusions were necessary to fix a gyp generation error, as
+        the gcc_version variable wasn't being defined for Android. Remove these
+        exceptions when Chromium is able to define the gcc_version variable.
+
+        * WTF.gyp/WTF.gyp:
+
 2012-06-18  Gustavo Noronha Silva  <[email protected]>
 
         Causes crashes in LLVMPipe

Modified: trunk/Source/WTF/WTF.gyp/WTF.gyp (121027 => 121028)


--- trunk/Source/WTF/WTF.gyp/WTF.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WTF/WTF.gyp/WTF.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -44,7 +44,7 @@
     ],
   },
   'conditions': [
-    ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version==46', {
+    ['os_posix == 1 and OS != "mac" and gcc_version==46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
         # with upcoming c++0x types.

Modified: trunk/Source/WebCore/ChangeLog (121027 => 121028)


--- trunk/Source/WebCore/ChangeLog	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WebCore/ChangeLog	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1,3 +1,16 @@
+2012-06-22  Peter Beverloo  <[email protected]>
+
+        [Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88853
+
+        Reviewed by Steve Block.
+
+        The Android exclusions were necessary to fix a gyp generation error, as
+        the gcc_version variable wasn't being defined for Android. Remove these
+        exceptions when Chromium is able to define the gcc_version variable.
+
+        * WebCore.gyp/WebCore.gyp:
+
 2012-06-22  Takashi Sakamoto  <[email protected]>
 
         [Shadow] parentTreeScope() of nested shadow DOM subtree returns document().

Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (121027 => 121028)


--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -275,7 +275,7 @@
         'cflags!': ['-g'],
       },
     }],
-    ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+    ['os_posix==1 and OS!="mac" and gcc_version==46', {
       'target_defaults': {
         # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict
         # with upcoming c++0x types.
@@ -1825,7 +1825,7 @@
         },{ # OS!="mac"
           'sources/': [['exclude', 'Mac\\.(cpp|mm?)$']]
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version == 42', {
+        ['os_posix == 1 and OS != "mac" and gcc_version == 42', {
           # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
           # warnings about uninitialized this.
           'cflags': ['-Wno-uninitialized'],
@@ -1979,7 +1979,7 @@
             ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version == 42', {
+        ['os_posix == 1 and OS != "mac" and gcc_version == 42', {
           # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
           # warnings about uninitialized this.
           'cflags': ['-Wno-uninitialized'],

Modified: trunk/Source/WebKit/chromium/ChangeLog (121027 => 121028)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1,3 +1,17 @@
+2012-06-22  Peter Beverloo  <[email protected]>
+
+        [Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88853
+
+        Reviewed by Steve Block.
+
+        The Android exclusions were necessary to fix a gyp generation error, as
+        the gcc_version variable wasn't being defined for Android. Remove these
+        exceptions when Chromium is able to define the gcc_version variable.
+
+        * WebKit.gyp:
+        * WebKitUnitTests.gyp:
+
 2012-06-22  Robert Kroeger  <[email protected]>
 
         Suppress horizontal conversion of PlatformWheelEvents when hasPreciseScrollingDeltas is true

Modified: trunk/Source/WebKit/chromium/WebKit.gyp (121027 => 121028)


--- trunk/Source/WebKit/chromium/WebKit.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WebKit/chromium/WebKit.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1036,7 +1036,7 @@
         },
     ], # targets
     'conditions': [
-        ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+        ['os_posix==1 and OS!="mac" and gcc_version==46', {
             'target_defaults': {
                 # Disable warnings about c++0x compatibility, as some names (such
                 # as nullptr) conflict with upcoming c++0x types.

Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (121027 => 121028)


--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -117,7 +117,7 @@
         }                
     ], # targets
     'conditions': [
-        ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+        ['os_posix==1 and OS!="mac" and gcc_version==46', {
             'target_defaults': {
                 # Disable warnings about c++0x compatibility, as some names (such
                 # as nullptr) conflict with upcoming c++0x types.

Modified: trunk/Tools/ChangeLog (121027 => 121028)


--- trunk/Tools/ChangeLog	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Tools/ChangeLog	2012-06-22 16:20:33 UTC (rev 121028)
@@ -1,3 +1,16 @@
+2012-06-22  Peter Beverloo  <[email protected]>
+
+        [Chromium] Disable c++0x compatibility warnings in _javascript_Core.gyp when building for Android
+        https://bugs.webkit.org/show_bug.cgi?id=88853
+
+        Reviewed by Steve Block.
+
+        The Android exclusions were necessary to fix a gyp generation error, as
+        the gcc_version variable wasn't being defined for Android. Remove these
+        exceptions when Chromium is able to define the gcc_version variable.
+
+        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
 2012-06-22  Mario Sanchez Prada  <[email protected]>
 
         Unreviewed gardening. Unskipping test passing after fixing bug 88419.

Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (121027 => 121028)


--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2012-06-22 16:00:48 UTC (rev 121027)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp	2012-06-22 16:20:33 UTC (rev 121028)
@@ -398,7 +398,7 @@
                 },
             }],
         }],
-        ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
+        ['os_posix==1 and OS!="mac" and gcc_version==46', {
             'target_defaults': {
                 # Disable warnings about c++0x compatibility, as some names (such
                 # as nullptr) conflict with upcoming c++0x types.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to