Push -no-integrated-as into openmax_dl build file.
This is to prepare no longer passing that flag globally,
https://codereview.chromium.org/1484883002/
BUG=chromium:124610
R=rtoy@google.com
Review URL: https://codereview.webrtc.org/1484103002 .
diff --git a/dl/BUILD.gn b/dl/BUILD.gn
index 7fa5dae..3b2f7b7 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 @@
# 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
diff --git a/dl/dl.gyp b/dl/dl.gyp
index 774151f..84b844f 100644
--- a/dl/dl.gyp
+++ b/dl/dl.gyp
@@ -19,6 +19,13 @@
'conditions' : [
['target_arch=="arm"', {
'conditions' : [
+ ['clang==1', {
+ # TODO(hans) Enable integrated-as (crbug.com/124610).
+ 'cflags': [
+ '-fno-integrated-as',
+ '-B<(android_toolchain)', # Else /usr/bin/as gets picked up.
+ ],
+ }],
['arm_neon==1', {
# Enable build-time NEON selection.
'defines': ['DL_ARM_NEON',],
