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

Side by Side Diff: trunk/src/chrome/chrome_tests_unit.gypi

Issue 387573003: Revert 282355 "Add chrome/browser/ui to the GN build." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | « trunk/src/chrome/chrome_tests.gypi ('k') | trunk/src/chrome/tools/build/repack_locales.py » ('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 'targets': [ 5 'targets': [
6 { 6 {
7 # This target contains mocks and test utilities that don't belong in 7 # This target contains mocks and test utilities that don't belong in
8 # production libraries but are used by more than one test executable. 8 # production libraries but are used by more than one test executable.
9 'target_name': 'test_support_common', 9 'target_name': 'test_support_common',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
2523 '<(DEPTH)/third_party/wtl/include', 2523 '<(DEPTH)/third_party/wtl/include',
2524 ], 2524 ],
2525 'sources': [ 2525 'sources': [
2526 # TODO: It would be nice to have these pulled in 2526 # TODO: It would be nice to have these pulled in
2527 # automatically from direct_dependent_settings in 2527 # automatically from direct_dependent_settings in
2528 # their various targets (net.gyp:net_resources, etc.), 2528 # their various targets (net.gyp:net_resources, etc.),
2529 # but that causes errors in other targets when 2529 # but that causes errors in other targets when
2530 # resulting .res files get referenced multiple times. 2530 # resulting .res files get referenced multiple times.
2531 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 2531 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2532 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc', 2532 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc',
2533 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', 2533 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_unscaled_resources.rc ',
2534 ], 2534 ],
2535 'link_settings': { 2535 'link_settings': {
2536 'libraries': [ 2536 'libraries': [
2537 '-lcomsupp.lib', 2537 '-lcomsupp.lib',
2538 '-loleacc.lib', 2538 '-loleacc.lib',
2539 '-lrpcrt4.lib', 2539 '-lrpcrt4.lib',
2540 '-lurlmon.lib', 2540 '-lurlmon.lib',
2541 '-lwinmm.lib', 2541 '-lwinmm.lib',
2542 ], 2542 ],
2543 }, 2543 },
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
2917 'unit_tests.isolate', 2917 'unit_tests.isolate',
2918 ], 2918 ],
2919 'sources': [ 2919 'sources': [
2920 'unit_tests.isolate', 2920 'unit_tests.isolate',
2921 ], 2921 ],
2922 }, 2922 },
2923 ], 2923 ],
2924 }], 2924 }],
2925 ], # 'conditions' 2925 ], # 'conditions'
2926 } 2926 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_tests.gypi ('k') | trunk/src/chrome/tools/build/repack_locales.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698