| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index c9f219ec5a79fca42b64fc13d2dbb9ddac9c4fe3..65dddfc705ecc6bc97dca3db27f76cee7e2abc4a 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1168,9 +1168,6 @@
|
| # http://code.google.com/p/googletest/source/detail?r=446 .
|
| # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
|
| '-Wno-unnamed-type-template-args',
|
| - # The integrated assembler chokes on one ffmpeg file.
|
| - # http://crbug.com/61931
|
| - '-no-integrated-as',
|
| ],
|
| 'cflags!': [
|
| # Clang doesn't seem to know know this flag.
|
|
|