Index: build/android.gypi |
diff --git a/build/android.gypi b/build/android.gypi |
index f984ea3af61b32b9728b58378eb6cb5c7d281d37..627dcc2678246e0af2851239635a747aae0654c4 100644 |
--- a/build/android.gypi |
+++ b/build/android.gypi |
@@ -74,13 +74,13 @@ |
], |
}, # Release |
}, # configurations |
- 'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter', |
- '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions', |
- # Note: Using -std=c++0x will define __STRICT_ANSI__, which in |
- # turn will leave out some template stuff for 'long long'. What |
- # we want is -std=c++11, but this is not supported by GCC 4.6 or |
- # Xcode 4.2 |
- '-std=gnu++0x' ], |
+ 'cflags': [ '-Wno-abi', '-Wall', '-W', '-Wno-unused-parameter'], |
+ 'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-fno-exceptions', |
+ # Note: Using -std=c++0x will define __STRICT_ANSI__, which |
+ # in turn will leave out some template stuff for 'long |
+ # long'. What we want is -std=c++11, but this is not |
+ # supported by GCC 4.6 or Xcode 4.2 |
+ '-std=gnu++0x' ], |
'target_conditions': [ |
['_toolset=="target"', { |
'cflags!': [ |
@@ -93,11 +93,13 @@ |
'-fno-short-enums', |
'-finline-limit=64', |
'-Wa,--noexecstack', |
- '-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings. |
# Note: This include is in cflags to ensure that it comes after |
# all of the includes. |
'-I<(android_include)', |
], |
+ 'cflags_cc': [ |
+ '-Wno-error=non-virtual-dtor', # TODO(michaelbai): Fix warnings. |
+ ], |
'defines': [ |
'ANDROID', |
#'__GNU_SOURCE=1', # Necessary for clone() |