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

Side by Side Diff: media/BUILD.gn

Issue 1323333002: Copy libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update include order and rebase Created 5 years, 3 months 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 | « content/test/BUILD.gn ('k') | media/DEPS » ('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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/arm.gni") 6 import("//build/config/arm.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/linux/pkg_config.gni") 8 import("//build/config/linux/pkg_config.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 347
348 if (current_cpu == "arm" && arm_use_neon) { 348 if (current_cpu == "arm" && arm_use_neon) {
349 defines += [ "USE_NEON" ] 349 defines += [ "USE_NEON" ]
350 } 350 }
351 351
352 if (media_use_libvpx) { 352 if (media_use_libvpx) {
353 sources += [ 353 sources += [
354 "filters/vpx_video_decoder.cc", 354 "filters/vpx_video_decoder.cc",
355 "filters/vpx_video_decoder.h", 355 "filters/vpx_video_decoder.h",
356 ] 356 ]
357 deps += [ "//third_party/libvpx" ] 357 deps += [ "//third_party/libvpx_new" ]
358 } 358 }
359 359
360 if (media_use_libwebm) { 360 if (media_use_libwebm) {
361 sources += [ 361 sources += [
362 "capture/webm_muxer.cc", 362 "capture/webm_muxer.cc",
363 "capture/webm_muxer.h", 363 "capture/webm_muxer.h",
364 ] 364 ]
365 deps += [ "//third_party/libwebm" ] 365 deps += [ "//third_party/libwebm" ]
366 } 366 }
367 367
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 "//media/base:test_support", 831 "//media/base:test_support",
832 "//media/test:pipeline_integration_tests", 832 "//media/test:pipeline_integration_tests",
833 "//testing/gmock", 833 "//testing/gmock",
834 "//testing/gtest", 834 "//testing/gtest",
835 "//third_party/ffmpeg", 835 "//third_party/ffmpeg",
836 "//ui/gfx/geometry", 836 "//ui/gfx/geometry",
837 "//ui/gfx:test_support", 837 "//ui/gfx:test_support",
838 ] 838 ]
839 } 839 }
840 } 840 }
OLDNEW
« no previous file with comments | « content/test/BUILD.gn ('k') | media/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698