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

Side by Side Diff: third_party/libvpx_new/BUILD.gn

Issue 1484883002: clang/arm: Push -no-integrated-as into the four targets that need it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.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 unified diff | Download patch
OLDNEW
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 30 matching lines...) Expand all
41 "//third_party/libvpx_new/source/config/$os_category/$cpu_arch_full" 41 "//third_party/libvpx_new/source/config/$os_category/$cpu_arch_full"
42 } 42 }
43 43
44 config("libvpx_config") { 44 config("libvpx_config") {
45 include_dirs = [ 45 include_dirs = [
46 "//third_party/libvpx_new/source/config", 46 "//third_party/libvpx_new/source/config",
47 platform_include_dir, 47 platform_include_dir,
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
52 if (current_cpu == "arm" && is_clang) {
53 # TODO(hans) Enable integrated-as (crbug.com/124610).
54 rebased_android_toolchain_root =
55 rebase_path(android_toolchain_root, root_build_dir)
56 asmflags = [
57 "-fno-integrated-as",
58 "-B${rebased_android_toolchain_root}/bin", # Else /usr/bin/as gets picked up.
59 ]
60 }
51 } 61 }
52 62
53 # gn orders flags on a target before flags from configs. The default config 63 # gn orders flags on a target before flags from configs. The default config
54 # adds -Wall, and these flags have to be after -Wall -- so they need to come 64 # adds -Wall, and these flags have to be after -Wall -- so they need to come
55 # from a config and can't be on the target directly. 65 # from a config and can't be on the target directly.
56 config("libvpx_warnings") { 66 config("libvpx_warnings") {
57 if (is_clang) { 67 if (is_clang) {
58 cflags = [ 68 cflags = [
59 # libvpx heavily relies on implicit enum casting. 69 # libvpx heavily relies on implicit enum casting.
60 "-Wno-conversion", 70 "-Wno-conversion",
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 } 306 }
297 if (is_android) { 307 if (is_android) {
298 deps += [ "//third_party/android_tools:cpu_features" ] 308 deps += [ "//third_party/android_tools:cpu_features" ]
299 } 309 }
300 if (current_cpu == "arm") { 310 if (current_cpu == "arm") {
301 deps += [ ":libvpx_assembly_arm" ] 311 deps += [ ":libvpx_assembly_arm" ]
302 } 312 }
303 313
304 public_configs = [ ":libvpx_external_config" ] 314 public_configs = [ ":libvpx_external_config" ]
305 } 315 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698