| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index f9a53b0f1c8fad6a4720973812ab3ef0e2efb5d0..7aabab466d9e808b1c3d9880070e5c73e9a150aa 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3039,7 +3039,7 @@
|
| '-mfpmath=sse',
|
| ],
|
| }],
|
| - ['clang==1 and (OS!="android" and chromeos!=1)', {
|
| + ['clang==1 and OS!="android"', {
|
| # Turn on C++11.
|
| 'cflags': [
|
| # This warns on using ints as initializers for floats in
|
| @@ -3060,7 +3060,7 @@
|
| '-std=gnu++11',
|
| ],
|
| }],
|
| - ['clang==1 and (OS=="android" or chromeos==1)', {
|
| + ['clang==1 and OS=="android"', {
|
| # Android uses gcc4.4, and clang isn't compatible with gcc4.4's
|
| # libstdc++ in C++11 mode. So no C++11 mode for Android yet.
|
| # Doesn't work with asan for some reason either: crbug.com/233464
|
|
|