[Chromium] Fix project file generation for the Android bot after r102201
authorpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2011 12:55:42 +0000 (12:55 +0000)
committerpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Dec 2011 12:55:42 +0000 (12:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=73996

The gyp refactoring in r102201 was didn't explicitly exclude
the Android operating system in Tools/Tools.gyp, which broke
as gcc_version is not defined for that configuration.

Reviewed by Andreas Kling.

* Tools.gyp:

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

Tools/ChangeLog
Tools/Tools.gyp

index ea9e7b3..b7d924b 100644 (file)
@@ -1,3 +1,16 @@
+2011-12-07  Peter Beverloo  <peter@chromium.org>
+
+        [Chromium] Fix project file generation for the Android bot after r102201
+        https://bugs.webkit.org/show_bug.cgi?id=73996
+
+        The gyp refactoring in r102201 was didn't explicitly exclude
+        the Android operating system in Tools/Tools.gyp, which broke
+        as gcc_version is not defined for that configuration.
+
+        Reviewed by Andreas Kling.
+
+        * Tools.gyp:
+
 2011-12-07  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Unreviewed. Disabled failing tests on chromium.
index f5a0785..6715bba 100644 (file)
                         },
                     }],
                 }],
-                ['os_posix==1 and OS!="mac" and gcc_version==46', {
+                ['os_posix==1 and OS!="mac" and OS!="android" and gcc_version==46', {
                     'target_defaults': {
                         # Disable warnings about c++0x compatibility, as some names (such
                         # as nullptr) conflict with upcoming c++0x types.