| 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/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 774 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 785 "//media/base:test_support", | 785 "//media/base:test_support", |
| 786 "//media/test:pipeline_integration_tests", | 786 "//media/test:pipeline_integration_tests", |
| 787 "//testing/gmock", | 787 "//testing/gmock", |
| 788 "//testing/gtest", | 788 "//testing/gtest", |
| 789 "//third_party/ffmpeg", | 789 "//third_party/ffmpeg", |
| 790 "//ui/gfx/geometry", | 790 "//ui/gfx/geometry", |
| 791 "//ui/gfx:test_support", | 791 "//ui/gfx:test_support", |
| 792 ] | 792 ] |
| 793 } | 793 } |
| 794 } | 794 } |
| 795 | |
| 796 if (use_x11) { | |
| 797 executable("player_x11") { | |
| 798 sources = [ | |
| 799 "tools/player_x11/data_source_logger.cc", | |
| 800 "tools/player_x11/data_source_logger.h", | |
| 801 "tools/player_x11/gl_video_renderer.cc", | |
| 802 "tools/player_x11/gl_video_renderer.h", | |
| 803 "tools/player_x11/player_x11.cc", | |
| 804 "tools/player_x11/x11_video_renderer.cc", | |
| 805 "tools/player_x11/x11_video_renderer.h", | |
| 806 ] | |
| 807 configs += [ | |
| 808 ":media_config", | |
| 809 "//build/config/linux:x11", | |
| 810 "//build/config/linux:xext", | |
| 811 | |
| 812 # TODO(ajwong): Why does xext get a separate thing in //build/config/linux
:BUILD.gn | |
| 813 # "//build/config/linux:xrender", | |
| 814 ] | |
| 815 deps = [ | |
| 816 ":media", | |
| 817 ":shared_memory_support", | |
| 818 "//base", | |
| 819 "//tools/xdisplaycheck", | |
| 820 "//ui/gl", | |
| 821 "//ui/gfx", | |
| 822 "//ui/gfx/geometry", | |
| 823 ] | |
| 824 } | |
| 825 } | |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1094553002:
Revert "Speculative revert by sheriff" (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master