| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 1dc3dcd6d8bc7594c0e782b0dea0abc119a894d5..c5e84b2ea5a8c1bbf624f64eff7b94bac0051fb9 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1308,15 +1308,12 @@
|
| ['OS=="android"', {
|
| # We directly set the gcc_version since we know what we use.
|
| 'gcc_version%': 46,
|
| - 'binutils_version%': 222,
|
| }, {
|
| 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
|
| - 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)',
|
| }],
|
| ],
|
| }, {
|
| 'gcc_version%': 0,
|
| - 'binutils_version%': 0,
|
| }],
|
| ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
|
| 'windows_sdk_path%': '<(windows_sdk_default_path)',
|
| @@ -1355,7 +1352,14 @@
|
| # can use breakpad for these builds.
|
| 'release_unwind_tables%': 0,
|
| }],
|
| + ['OS=="android"', {
|
| + 'binutils_version%': 222,
|
| + }, {
|
| + 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)',
|
| + }],
|
| ],
|
| + }, {
|
| + 'binutils_version%': 0,
|
| }], # os_posix==1 and OS!="mac" and OS!="ios"
|
| ['OS=="ios"', {
|
| 'disable_nacl%': 1,
|
|
|