Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5471)

Unified Diff: build/common.gypi

Issue 1263213002: Support Android x86 ASan build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | tools/clang/scripts/update.sh » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
Nico 2015/07/31 16:56:54 why this change?
Oliver Chang 2015/07/31 17:46:31 Clang doesn't seem to support "x86" as a target cp
],
'ldflags': [
- '-target x86-linux-androideabi',
+ '-target i686-linux-androideabi',
],
}],
# Place holder for x64 support, not tested.
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | tools/clang/scripts/update.sh » ('J')

Powered by Google App Engine
This is Rietveld 408576698