Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 110e195cbe1766182bf82fcbde68d850b58c0586..09cfee87f65f4cc4b01879db94089230e40a161f 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -4903,6 +4903,10 @@ |
'-D__compiler_offsetof=__builtin_offsetof', |
'-Dnan=__builtin_nan', |
], |
+ 'cflags!': [ |
+ # Clang does not support the following options. |
+ '-finline-limit=64', |
+ ], |
'conditions': [ |
['target_arch=="arm"', { |
'cflags': [ |
@@ -4914,10 +4918,10 @@ |
}], |
['target_arch=="ia32"', { |
'cflags': [ |
- '-target x86-linux-androideabi', |
+ '-target i686-linux-androideabi', |
], |
'ldflags': [ |
- '-target x86-linux-androideabi', |
+ '-target i686-linux-androideabi', |
], |
}], |
# Place holder for x64 support, not tested. |