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

Unified Diff: build/config/android/BUILD.gn

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index 570417b080bde70c27ce08ccb17efaef8cc3b5ad..39dd826aeea54a387ef64a28c16873cd10b5c59b 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -33,9 +33,9 @@ config("compiler") {
if (is_clang) {
rebased_android_toolchain_root =
rebase_path(android_toolchain_root, root_build_dir)
- if (current_cpu == "arm" || current_cpu == "mipsel") {
+ if (current_cpu == "mipsel") {
hans 2015/12/01 15:18:24 Is the MIPS build gn only?
Nico 2015/12/01 15:21:37 No, gyp has something like this somewhere too.
cflags += [
- # TODO(hans) Enable integrated-as (crbug.com/124610).
+ # TODO(gordanac) Enable integrated-as.com/124610).
Johann 2015/12/01 15:26:18 Typo in the comment
Nico 2015/12/01 16:27:57 Done.
"-no-integrated-as",
"-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
]

Powered by Google App Engine
This is Rietveld 408576698