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

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

Issue 2528543002: Roll src/third_party/libvpx/source/libvpx/ 5c64c01c7..d7f1d60c5 (36 commits). (Closed)
Patch Set: rebase for DEPS Created 4 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
« no previous file with comments | « DEPS ('k') | third_party/libvpx/README.chromium » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/libvpx_srcs.gni") 8 import("//third_party/libvpx/libvpx_srcs.gni")
9 import("//third_party/yasm/yasm_assemble.gni") 9 import("//third_party/yasm/yasm_assemble.gni")
10 10
(...skipping 20 matching lines...) Expand all
31 31
32 if (is_nacl) { 32 if (is_nacl) {
33 platform_include_dir = "//third_party/libvpx/source/config/nacl" 33 platform_include_dir = "//third_party/libvpx/source/config/nacl"
34 } else { 34 } else {
35 # The mac configurations are currently a relic. They were useful when 35 # The mac configurations are currently a relic. They were useful when
36 # x86inc.asm did not work for MACH_O but now the build is identical to the 36 # x86inc.asm did not work for MACH_O but now the build is identical to the
37 # linux config. iOS for arm on the other hand needs an apple-specific twist in 37 # linux config. iOS for arm on the other hand needs an apple-specific twist in
38 # vpx_config.asm 38 # vpx_config.asm
39 if (is_ios && current_cpu == "arm") { 39 if (is_ios && current_cpu == "arm") {
40 os_category = current_os 40 os_category = current_os
41 } else if (is_posix) { # Should cover linux, mac, and the ios simulator. 41 } else if (is_posix) { # Should cover linux, mac, and the ios simulator.
42 os_category = "linux" 42 os_category = "linux"
43 } else { # This should only match windows. 43 } else { # This should only match windows.
44 os_category = current_os 44 os_category = current_os
45 } 45 }
46 platform_include_dir = 46 platform_include_dir =
47 "//third_party/libvpx/source/config/$os_category/$cpu_arch_full" 47 "//third_party/libvpx/source/config/$os_category/$cpu_arch_full"
48 } 48 }
49 49
50 config("libvpx_config") { 50 config("libvpx_config") {
51 include_dirs = [ 51 include_dirs = [
52 "//third_party/libvpx/source/config", 52 "//third_party/libvpx/source/config",
53 platform_include_dir, 53 platform_include_dir,
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 } 327 }
328 if (is_android) { 328 if (is_android) {
329 deps += [ "//third_party/android_tools:cpu_features" ] 329 deps += [ "//third_party/android_tools:cpu_features" ]
330 } 330 }
331 if (current_cpu == "arm" && arm_assembly_sources != []) { 331 if (current_cpu == "arm" && arm_assembly_sources != []) {
332 deps += [ ":libvpx_assembly_arm" ] 332 deps += [ ":libvpx_assembly_arm" ]
333 } 333 }
334 334
335 public_configs = [ ":libvpx_external_config" ] 335 public_configs = [ ":libvpx_external_config" ]
336 } 336 }
OLDNEW
« no previous file with comments | « DEPS ('k') | third_party/libvpx/README.chromium » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698