OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import("//build/config/arm.gni") | 5 import("//build/config/arm.gni") |
6 import("//build/config/android/config.gni") | 6 import("//build/config/android/config.gni") |
7 import("//build/config/sanitizers/sanitizers.gni") | 7 import("//build/config/sanitizers/sanitizers.gni") |
8 import("//third_party/libvpx_new/libvpx_srcs.gni") | 8 import("//third_party/libvpx_new/libvpx_srcs.gni") |
9 import("//third_party/yasm/yasm_assemble.gni") | 9 import("//third_party/yasm/yasm_assemble.gni") |
10 | 10 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 "//third_party/libvpx_new/source/libvpx", | 48 "//third_party/libvpx_new/source/libvpx", |
49 "$root_gen_dir/third_party/libvpx_new", # Provides vpx_rtcd.h. | 49 "$root_gen_dir/third_party/libvpx_new", # Provides vpx_rtcd.h. |
50 ] | 50 ] |
51 | 51 |
52 if (current_cpu == "arm" && is_clang) { | 52 if (current_cpu == "arm" && is_clang) { |
53 # TODO(hans) Enable integrated-as (crbug.com/124610). | 53 # TODO(hans) Enable integrated-as (crbug.com/124610). |
54 asmflags = [ "-fno-integrated-as" ] | 54 asmflags = [ "-fno-integrated-as" ] |
55 if (is_android) { | 55 if (is_android) { |
56 rebased_android_toolchain_root = | 56 rebased_android_toolchain_root = |
57 rebase_path(android_toolchain_root, root_build_dir) | 57 rebase_path(android_toolchain_root, root_build_dir) |
| 58 |
58 # Else /usr/bin/as gets picked up. | 59 # Else /usr/bin/as gets picked up. |
59 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] | 60 asmflags += [ "-B${rebased_android_toolchain_root}/bin" ] |
60 } | 61 } |
61 } | 62 } |
62 } | 63 } |
63 | 64 |
64 # gn orders flags on a target before flags from configs. The default config | 65 # gn orders flags on a target before flags from configs. The default config |
65 # adds -Wall, and these flags have to be after -Wall -- so they need to come | 66 # adds -Wall, and these flags have to be after -Wall -- so they need to come |
66 # from a config and can't be on the target directly. | 67 # from a config and can't be on the target directly. |
67 config("libvpx_warnings") { | 68 config("libvpx_warnings") { |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 } | 308 } |
308 if (is_android) { | 309 if (is_android) { |
309 deps += [ "//third_party/android_tools:cpu_features" ] | 310 deps += [ "//third_party/android_tools:cpu_features" ] |
310 } | 311 } |
311 if (current_cpu == "arm") { | 312 if (current_cpu == "arm") { |
312 deps += [ ":libvpx_assembly_arm" ] | 313 deps += [ ":libvpx_assembly_arm" ] |
313 } | 314 } |
314 | 315 |
315 public_configs = [ ":libvpx_external_config" ] | 316 public_configs = [ ":libvpx_external_config" ] |
316 } | 317 } |
OLD | NEW |