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

Unified Diff: dl/BUILD.gn

Issue 1486143002: Only pass android_toolchain in android builds. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc/deps/third_party/openmax.git@master
Patch Set: . Created 5 years 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 | dl/dl.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dl/BUILD.gn
diff --git a/dl/BUILD.gn b/dl/BUILD.gn
index 3b2f7b758a61cd7bc00a1be7568e91a3262c4ce5..5459f48c109f22a944927888c184811b643919f8 100644
--- a/dl/BUILD.gn
+++ b/dl/BUILD.gn
@@ -27,12 +27,13 @@ config("dl_config") {
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.
- ]
+ asmflags = [ "-fno-integrated-as" ]
+ if (is_android) {
+ rebased_android_toolchain_root =
+ rebase_path(android_toolchain_root, root_build_dir)
+ # Else /usr/bin/as gets picked up.
+ asmflags += [ "-B${rebased_android_toolchain_root}/bin" ]
+ }
}
}
« no previous file with comments | « no previous file | dl/dl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698