Chromium Code Reviews| Index: build/common.gypi |
| diff --git a/build/common.gypi b/build/common.gypi |
| index 91a4d894e99eab1084d06a0819a8555c2c2961f4..a05bb1e65e542ef01fd53371231c5d33704e1bf1 100644 |
| --- a/build/common.gypi |
| +++ b/build/common.gypi |
| @@ -2774,6 +2774,49 @@ |
| '--sysroot=<(android_ndk_sysroot)', |
| ], |
| }], |
| + ['android_build_type==1', { |
| + 'include_dirs': [ |
| + # OpenAL headers from the Android tree. |
| + '<(android_src)/frameworks/wilhelm/include', |
| + ], |
| + 'cflags': [ |
| + # Chromium builds its own (non-third-party) code with |
| + # -Werror to make all warnings into errors. However, Android |
| + # enables warnings that Chromium doesn't, so some of these |
| + # extra warnings trip and break things. |
| + # For now, we leave these warnings enabled but prevent them |
| + # from being treated as errors. |
| + # |
| + # Things that are part of -Wextra: |
| + '-Wno-error=extra', # Enabled by -Wextra, but no specific flag |
| + '-Wno-error=ignored-qualifiers', |
| + '-Wno-error=type-limits', |
| + # Other things unrelated to -Wextra: |
| + '-Wno-error=non-virtual-dtor', |
| + '-Wno-error=sign-promo', |
| + ], |
| + 'cflags_cc': [ |
| + # Disabling c++0x-compat should be handled in WebKit, but |
| + # this currently doesn't work because gcc_version is not set |
| + # correctly when building with the Android build system. |
| + # TODO(torne): Fix this in WebKit. |
| + '-Wno-error=c++0x-compat', |
| + ], |
| + }], |
| + ['android_build_type==1 and chromium_code==0', { |
| + 'cflags': [ |
| + # There is a class of warning which: |
| + # 1) Android always enables and also treats as errors |
| + # 2) Chromium ignores in third party code |
| + # For now, I am leaving these warnings enabled but preventing |
| + # them from being treated as errors here. |
| + '-Wno-error=address', |
| + '-Wno-error=format-security', |
| + '-Wno-error=non-virtual-dtor', |
| + '-Wno-error=return-type', |
| + '-Wno-error=sequence-point', |
|
Nico
2012/12/07 20:41:41
I happened to see this while reading common.gypi f
|
| + ], |
| + }], |
| ['target_arch == "arm"', { |
| 'ldflags': [ |
| # Enable identical code folding to reduce size. |