| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index fb780fc2202b940ee09c00450da0aea345c47705..282a4dcd1d7b7d51b8709bdc4b30e333550a8c17 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -3622,7 +3622,9 @@
|
| '-gdwarf-4',
|
| ],
|
| 'conditions' : [
|
| - ['OS=="android"', {
|
| + ['OS=="android" and target_arch!="mipsel" and target_arch!="mips64el"', {
|
| + # TODO(jdduke) Re-enable on mips after resolving linking
|
| + # issues with libc++ (crbug.com/456380).
|
| 'ldflags': [
|
| # Warn in case of text relocations.
|
| '-Wl,--warn-shared-textrel',
|
| @@ -3715,15 +3717,19 @@
|
| '-fomit-frame-pointer',
|
| ]
|
| }],
|
| - ['OS=="android"', {
|
| - 'variables': {
|
| - 'release_optimize%': 's',
|
| - },
|
| + ['OS=="android" and target_arch!="mipsel" and target_arch!="mips64el"', {
|
| + # TODO(jdduke) Re-enable on mips after resolving linking
|
| + # issues with libc++ (crbug.com/456380).
|
| 'ldflags': [
|
| # Warn in case of text relocations.
|
| '-Wl,--warn-shared-textrel',
|
| ],
|
| }],
|
| + ['OS=="android"', {
|
| + 'variables': {
|
| + 'release_optimize%': 's',
|
| + },
|
| + }],
|
| ['profiling==1', {
|
| 'cflags': [
|
| '-fno-omit-frame-pointer',
|
|
|