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

Unified Diff: dl/BUILD.gn

Issue 1484103002: Push -no-integrated-as into openmax_dl build file. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc/deps/third_party/openmax.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
« 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 7fa5daeffd182d3f7c03140cd9ff893fed013ac2..3b2f7b758a61cd7bc00a1be7568e91a3262c4ce5 100644
--- a/dl/BUILD.gn
+++ b/dl/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/android/config.gni")
import("//build/config/arm.gni")
declare_args() {
@@ -23,6 +24,16 @@ config("dl_config") {
# Enable build-time NEON selection.
defines = [ "DL_ARM_NEON" ]
}
+
+ 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.
+ ]
+ }
}
# GYP: third_party/openmax_dl/dl/dl.gyp:openmax_dl
« 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