Chromium Code Reviews| Index: gyp/common_conditions.gypi |
| diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi |
| index 60376f7273535439508f5ed02c86c276590127b3..2326650390abf8077687d5a47a5cdc75720b6bbd 100644 |
| --- a/gyp/common_conditions.gypi |
| +++ b/gyp/common_conditions.gypi |
| @@ -225,6 +225,25 @@ |
| '-mfpu=neon', |
| '-mfloat-abi=softfp', |
| ], |
| + 'cflags!': [ |
|
reed1
2014/03/25 14:20:16
// add comments for the "why" of disabling these?
scroggo
2014/03/25 14:38:11
Done.
|
| + '-g', |
| + '-march=armv7-a', |
| + '-mthumb', |
| + '-mfpu=neon', |
| + '-mfloat-abi=softfp', |
| + # This flag is not supported by Android build system. |
| + '-Wno-c++11-extensions', |
| + '-fno-exceptions', |
| + '-fstrict-aliasing', |
| + '-Wall', |
| + '-Wextra', |
| + '-Winit-self', |
| + '-Wpointer-arith', |
| + ], |
| + 'cflags_cc!': [ |
| + '-fno-rtti', |
| + '-Wnon-virtual-dtor', |
| + ], |
| 'defines': [ |
| 'DCT_IFAST_SUPPORTED', |
| # using freetype's embolden allows us to adjust fake bold settings at |
| @@ -507,6 +526,9 @@ |
| '-lstdc++', |
| '-lm', |
| ], |
| + 'cflags!': [ |
| + '-fuse-ld=gold', |
| + ], |
| }], |
| [ 'skia_shared_lib', { |
| 'cflags': [ |