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

Side by Side Diff: content/content_tests.gypi

Issue 10638010: Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 | « content/content_shell.gypi ('k') | content/public/app/startup_helper_win.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 '../webkit/support/webkit_support.gyp:dom_storage', 213 '../webkit/support/webkit_support.gyp:dom_storage',
214 '../webkit/support/webkit_support.gyp:fileapi', 214 '../webkit/support/webkit_support.gyp:fileapi',
215 '../webkit/support/webkit_support.gyp:glue', 215 '../webkit/support/webkit_support.gyp:glue',
216 '../webkit/support/webkit_support.gyp:quota', 216 '../webkit/support/webkit_support.gyp:quota',
217 '../webkit/support/webkit_support.gyp:webkit_media', 217 '../webkit/support/webkit_support.gyp:webkit_media',
218 ], 218 ],
219 'include_dirs': [ 219 'include_dirs': [
220 '..', 220 '..',
221 ], 221 ],
222 'sources': [ 222 'sources': [
223 'app/startup_helper_win.cc',
223 'browser/accessibility/browser_accessibility_mac_unittest.mm', 224 'browser/accessibility/browser_accessibility_mac_unittest.mm',
224 'browser/accessibility/browser_accessibility_manager_unittest.cc', 225 'browser/accessibility/browser_accessibility_manager_unittest.cc',
225 'browser/accessibility/browser_accessibility_win_unittest.cc', 226 'browser/accessibility/browser_accessibility_win_unittest.cc',
226 'browser/appcache/chrome_appcache_service_unittest.cc', 227 'browser/appcache/chrome_appcache_service_unittest.cc',
227 'browser/browser_thread_unittest.cc', 228 'browser/browser_thread_unittest.cc',
228 'browser/browser_url_handler_impl_unittest.cc', 229 'browser/browser_url_handler_impl_unittest.cc',
229 'browser/child_process_security_policy_unittest.cc', 230 'browser/child_process_security_policy_unittest.cc',
230 'browser/debugger/devtools_manager_unittest.cc', 231 'browser/debugger/devtools_manager_unittest.cc',
231 'browser/device_orientation/provider_unittest.cc', 232 'browser/device_orientation/provider_unittest.cc',
232 'browser/download/base_file_unittest.cc', 233 'browser/download/base_file_unittest.cc',
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 '../ui/ui.gyp:ui', 516 '../ui/ui.gyp:ui',
516 '../webkit/support/webkit_support.gyp:glue', 517 '../webkit/support/webkit_support.gyp:glue',
517 ], 518 ],
518 'include_dirs': [ 519 'include_dirs': [
519 '..', 520 '..',
520 ], 521 ],
521 'defines': [ 522 'defines': [
522 'HAS_OUT_OF_PROC_TEST_RUNNER', 523 'HAS_OUT_OF_PROC_TEST_RUNNER',
523 ], 524 ],
524 'sources': [ 525 'sources': [
526 'app/startup_helper_win.cc',
525 'public/test/test_launcher.h', 527 'public/test/test_launcher.h',
526 'test/content_browser_test.h', 528 'test/content_browser_test.h',
527 'test/content_browser_test.cc', 529 'test/content_browser_test.cc',
528 'test/content_test_launcher.cc', 530 'test/content_test_launcher.cc',
529 ], 531 ],
530 'conditions': [ 532 'conditions': [
531 ['OS=="win"', { 533 ['OS=="win"', {
532 'resource_include_dirs': [ 534 'resource_include_dirs': [
533 '<(SHARED_INTERMEDIATE_DIR)/webkit', 535 '<(SHARED_INTERMEDIATE_DIR)/webkit',
534 ], 536 ],
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 668 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
667 '<(PRODUCT_DIR)/lib.java/chromium_content.jar', 669 '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
668 ], 670 ],
669 }, 671 },
670 'includes': [ '../build/apk_test.gypi' ], 672 'includes': [ '../build/apk_test.gypi' ],
671 }, 673 },
672 ], 674 ],
673 }], 675 }],
674 ], 676 ],
675 } 677 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | content/public/app/startup_helper_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698