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

Unified Diff: third_party/libvpx_new/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: third_party/libvpx_new/BUILD.gn
diff --git a/third_party/libvpx_new/BUILD.gn b/third_party/libvpx_new/BUILD.gn
index 94c8c4b22401afd84dab364da8db26d28df51454..3c7583fb82654b505a52be68d32dea24b74d899a 100644
--- a/third_party/libvpx_new/BUILD.gn
+++ b/third_party/libvpx_new/BUILD.gn
@@ -48,6 +48,16 @@ config("libvpx_config") {
"//third_party/libvpx_new/source/libvpx",
"$root_gen_dir/third_party/libvpx_new", # Provides vpx_rtcd.h.
]
+
+ if (current_cpu == "arm" && is_clang) {
+ # TODO(hans) Enable integrated-as (crbug.com/124610).
+ rebased_android_toolchain_root =
+ rebase_path(android_toolchain_root, root_build_dir)
+ asmflags = [
+ "-fno-integrated-as",
+ "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
+ ]
+ }
}
# gn orders flags on a target before flags from configs. The default config

Powered by Google App Engine
This is Rietveld 408576698