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

Unified Diff: third_party/boringssl/BUILD.gn

Issue 1888763002: Build 64bit browser for Android with clang for ARMv8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch Set 5: Keep -fno-integrated-as as ARMv7 needs it Created 4 years, 7 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
Index: third_party/boringssl/BUILD.gn
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index 9b9badaa78099f08779fc50bee12906e33e37062..2f8ccc632abee0415f2a2de1f821ec42deaa7160 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -67,9 +67,11 @@ if (is_win && !is_msan) {
asmflags = []
include_dirs = [ "src/include" ]
- if (current_cpu == "arm" && is_clang) {
- # TODO(hans) Enable integrated-as (crbug.com/124610).
- asmflags += [ "-fno-integrated-as" ]
+ if ((current_cpu == "arm" || current_cpu == "arm64") && is_clang) {
+ if (current_cpu == "arm") {
+ # TODO(hans) Enable integrated-as (crbug.com/124610).
+ asmflags += [ "-fno-integrated-as" ]
+ }
if (is_android) {
rebased_android_toolchain_root =
rebase_path(android_toolchain_root, root_build_dir)

Powered by Google App Engine
This is Rietveld 408576698