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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 2005703002: (reland) media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 7 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
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2145 ['enable_plugins==1 and disable_nacl==0', { 2145 ['enable_plugins==1 and disable_nacl==0', {
2146 'dependencies': [ 2146 'dependencies': [
2147 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin', 2147 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin',
2148 ], 2148 ],
2149 }], 2149 }],
2150 ['toolkit_views==1', { 2150 ['toolkit_views==1', {
2151 'dependencies': [ 2151 'dependencies': [
2152 '../ui/views/views.gyp:views', 2152 '../ui/views/views.gyp:views',
2153 ], 2153 ],
2154 }], 2154 }],
2155 ['enable_pepper_cdms==1', {
2156 'sources' : [
2157 'browser/media/pepper_cdm_test_helper.cc',
2158 'browser/media/pepper_cdm_test_helper.h',
2159 ],
2160 'dependencies': [
2161 '../media/media.gyp:cdm_paths',
2162 ],
2163 }],
2155 ], 2164 ],
2156 }, 2165 },
2157 { 2166 {
2158 # GN version: //chrome/test:test_support_unit 2167 # GN version: //chrome/test:test_support_unit
2159 'target_name': 'test_support_unit', 2168 'target_name': 'test_support_unit',
2160 'type': 'static_library', 2169 'type': 'static_library',
2161 'dependencies': [ 2170 'dependencies': [
2162 'chrome_resources.gyp:chrome_resources', 2171 'chrome_resources.gyp:chrome_resources',
2163 'chrome_resources.gyp:chrome_strings', 2172 'chrome_resources.gyp:chrome_strings',
2164 'browser', 2173 'browser',
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
2989 'dependencies': [ 2998 'dependencies': [
2990 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2999 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2991 ], 3000 ],
2992 }], 3001 }],
2993 ], 3002 ],
2994 }, 3003 },
2995 ], 3004 ],
2996 }], 3005 }],
2997 ], # 'conditions' 3006 ], # 'conditions'
2998 } 3007 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/common/BUILD.gn » ('j') | media/cdm_paths.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698