| 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
|
|
|