| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 9f9456bad82ccb2f33e9f068b0a80e9a0b67b098..298ea62ea2891486591df23f369185009057061e 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -389,7 +389,7 @@
|
|
|
| # linux_use_gold_binary: whether to use the binary checked into
|
| # third_party/gold.
|
| - ['host_arch=="x64"', {
|
| + ['host_arch=="x64" and OS!="android"', {
|
| 'linux_use_gold_binary%': 1,
|
| }, {
|
| 'linux_use_gold_binary%': 0,
|
| @@ -398,7 +398,7 @@
|
| # linux_use_gold_flags: whether to use build flags that rely on gold.
|
| # On by default for x64 Linux. Temporarily off for ChromeOS as
|
| # it failed on a buildbot.
|
| - ['host_arch=="x64" and chromeos==0', {
|
| + ['host_arch=="x64" and chromeos==0 and OS!="android"', {
|
| 'linux_use_gold_flags%': 1,
|
| }, {
|
| 'linux_use_gold_flags%': 0,
|
|
|