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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 2001953002: Revert of media: Use platform specific folders for CDMs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/common/BUILD.gn » ('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 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 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after
2144 ['enable_plugins==1 and disable_nacl==0', { 2144 ['enable_plugins==1 and disable_nacl==0', {
2145 'dependencies': [ 2145 'dependencies': [
2146 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin', 2146 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_pl ugin',
2147 ], 2147 ],
2148 }], 2148 }],
2149 ['toolkit_views==1', { 2149 ['toolkit_views==1', {
2150 'dependencies': [ 2150 'dependencies': [
2151 '../ui/views/views.gyp:views', 2151 '../ui/views/views.gyp:views',
2152 ], 2152 ],
2153 }], 2153 }],
2154 ['enable_pepper_cdms==1', {
2155 'sources' : [
2156 'browser/media/pepper_cdm_test_helper.cc',
2157 'browser/media/pepper_cdm_test_helper.h',
2158 ],
2159 'dependencies': [
2160 '../media/media.gyp:cdm_paths',
2161 ],
2162 }],
2163 ], 2154 ],
2164 }, 2155 },
2165 { 2156 {
2166 # GN version: //chrome/test:test_support_unit 2157 # GN version: //chrome/test:test_support_unit
2167 'target_name': 'test_support_unit', 2158 'target_name': 'test_support_unit',
2168 'type': 'static_library', 2159 'type': 'static_library',
2169 'dependencies': [ 2160 'dependencies': [
2170 'chrome_resources.gyp:chrome_resources', 2161 'chrome_resources.gyp:chrome_resources',
2171 'chrome_resources.gyp:chrome_strings', 2162 'chrome_resources.gyp:chrome_strings',
2172 'browser', 2163 'browser',
(...skipping 824 matching lines...) Expand 10 before | Expand all | Expand 10 after
2997 'dependencies': [ 2988 'dependencies': [
2998 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2989 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2999 ], 2990 ],
3000 }], 2991 }],
3001 ], 2992 ],
3002 }, 2993 },
3003 ], 2994 ],
3004 }], 2995 }],
3005 ], # 'conditions' 2996 ], # 'conditions'
3006 } 2997 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698