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

Side by Side Diff: base/base.gyp

Issue 955273002: Fix PEImage tests to use a checked in binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove incorrect isolate entry Created 5 years, 9 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 | « base/BUILD.gn ('k') | base/base_unittests.isolate » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 ], 771 ],
772 }, 772 },
773 ], 773 ],
774 ['OS == "win"', { 774 ['OS == "win"', {
775 'sources!': [ 775 'sources!': [
776 'file_descriptor_shuffle_unittest.cc', 776 'file_descriptor_shuffle_unittest.cc',
777 'files/dir_reader_posix_unittest.cc', 777 'files/dir_reader_posix_unittest.cc',
778 'message_loop/message_pump_libevent_unittest.cc', 778 'message_loop/message_pump_libevent_unittest.cc',
779 'threading/worker_pool_posix_unittest.cc', 779 'threading/worker_pool_posix_unittest.cc',
780 ], 780 ],
781 'dependencies': [
782 'pe_image_test',
783 ],
784 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 781 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
785 'msvs_disabled_warnings': [ 782 'msvs_disabled_warnings': [
786 4267, 783 4267,
787 ], 784 ],
788 'conditions': [ 785 'conditions': [
789 # This is needed so base_unittests uses the allocator shim, as 786 # This is needed so base_unittests uses the allocator shim, as
790 # SecurityTest.MemoryAllocationRestriction* tests are dependent 787 # SecurityTest.MemoryAllocationRestriction* tests are dependent
791 # on tcmalloc. 788 # on tcmalloc.
792 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into 789 # TODO(wfh): crbug.com/246278 Move tcmalloc specific tests into
793 # their own test suite. 790 # their own test suite.
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 'sources': [ 1541 'sources': [
1545 'debug_message.cc', 1542 'debug_message.cc',
1546 ], 1543 ],
1547 'msvs_settings': { 1544 'msvs_settings': {
1548 'VCLinkerTool': { 1545 'VCLinkerTool': {
1549 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1546 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1550 }, 1547 },
1551 }, 1548 },
1552 }, 1549 },
1553 { 1550 {
1551 # Target to manually rebuild pe_image_test.dll which is checked into
1552 # base/test/data/pe_image.
1554 'target_name': 'pe_image_test', 1553 'target_name': 'pe_image_test',
1555 'type': 'shared_library', 1554 'type': 'shared_library',
1556 'sources': [ 1555 'sources': [
1557 'win/pe_image_test.cc', 1556 'win/pe_image_test.cc',
1558 ], 1557 ],
1559 'msvs_settings': { 1558 'msvs_settings': {
1560 'VCLinkerTool': { 1559 'VCLinkerTool': {
1561 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1560 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1562 'DelayLoadDLLs': [ 1561 'DelayLoadDLLs': [
1563 'cfgmgr32.dll', 1562 'cfgmgr32.dll',
(...skipping 27 matching lines...) Expand all
1591 'dependencies': [ 1590 'dependencies': [
1592 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1591 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1593 ], 1592 ],
1594 }], 1593 }],
1595 ], 1594 ],
1596 }, 1595 },
1597 ], 1596 ],
1598 }], 1597 }],
1599 ], 1598 ],
1600 } 1599 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | base/base_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698