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

Unified Diff: build/common.gypi

Issue 485783002: Don't pass -target arm-linux-gnueabihf on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | no next file » | no next file with comments »
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 b2bf16bc44081fa937744aba5cc44f03059ec0a7..1506bdd06652bd70d27d63ca9ee398c166a95cd6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3718,7 +3718,7 @@
'-Wno-abi',
],
}],
- ['clang==1 and arm_arch!=""', {
+ ['clang==1 and arm_arch!="" and OS!="android"', {
'cflags': [
'-target arm-linux-gnueabihf',
# TODO(sbc): Remove this once the warning in libvpx is fixed:
@@ -3734,10 +3734,10 @@
'-march=<(arm_arch)',
],
}],
- ['clang==1', {
+ ['clang==1 and OS!="android"', {
'cflags': [
- # We need to disable clang's builtin assember as it can't
- # handle a several of asm files.
+ # We need to disable clang's builtin assembler as it can't
+ # handle several asm files, crbug.com/124610
'-no-integrated-as',
],
}],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698