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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Make chromeos crypto dep explicit. Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | chromeos/chromeos.gyp » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 2054 matching lines...) Expand 10 before | Expand all | Expand 10 after
2065 }], 2065 }],
2066 ['enable_app_list==0', { 2066 ['enable_app_list==0', {
2067 'sources/': [ 2067 'sources/': [
2068 ['exclude', '^browser/ui/app_list/'], 2068 ['exclude', '^browser/ui/app_list/'],
2069 ], 2069 ],
2070 }], 2070 }],
2071 ['enable_plugins==1', { 2071 ['enable_plugins==1', {
2072 'dependencies': [ 2072 'dependencies': [
2073 # Runtime dependency. 2073 # Runtime dependency.
2074 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', 2074 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
2075 '../webkit/support/webkit_support.gyp:clearkeycdmadapter', 2075 '../media/media.gyp:clearkeycdmadapter',
2076 ], 2076 ],
2077 }], 2077 }],
2078 ], # conditions 2078 ], # conditions
2079 }, # target browser_tests 2079 }, # target browser_tests
2080 { 2080 {
2081 # Executable that runs each perf browser test in a new process. 2081 # Executable that runs each perf browser test in a new process.
2082 'target_name': 'performance_browser_tests', 2082 'target_name': 'performance_browser_tests',
2083 'type': 'executable', 2083 'type': 'executable',
2084 'msvs_cygwin_shell': 0, 2084 'msvs_cygwin_shell': 0,
2085 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'], 2085 'msvs_cygwin_dirs': ['<(DEPTH)/third_party/cygwin'],
(...skipping 1311 matching lines...) Expand 10 before | Expand all | Expand 10 after
3397 'utility', 3397 'utility',
3398 ], 3398 ],
3399 'sources': [ 3399 'sources': [
3400 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3400 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3401 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3401 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3402 ], 3402 ],
3403 }] 3403 }]
3404 }], 3404 }],
3405 ], # 'conditions' 3405 ], # 'conditions'
3406 } 3406 }
OLDNEW
« no previous file with comments | « DEPS ('k') | chromeos/chromeos.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698