Index: chrome/android/BUILD.gn |
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn |
index 48f5d395a33f053f29dced488d2fcd7d6df87eab..a8358b8c61f4a6f741544d38f7deb8b915f65985 100644 |
--- a/chrome/android/BUILD.gn |
+++ b/chrome/android/BUILD.gn |
@@ -644,12 +644,12 @@ shared_library("chrome") { |
[ "//third_party/gvr-android-sdk/libgvr_shim_static_${current_cpu}.a" ] |
} |
- if (is_android && use_order_profiling) { |
+ if (use_order_profiling) { |
deps += [ "//tools/cygprofile" ] |
} |
- # See crbug.com/705088 for more info. |
- if (is_android && target_cpu == "arm" && is_asan) { |
+ # See crbug.com/705088, crbug.com/717815. |
+ if (target_cpu == "arm" && (is_asan || use_order_profiling)) { |
ldflags = [ "-Wl,--long-plt" ] |
} |