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

Side by Side Diff: Source/wtf/wtf_tests.gyp

Issue 177053003: Enable use_allocator instead of linux_use_tcmalloc in Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased Created 6 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 | « Source/web/web_tests.gyp ('k') | no next file » | 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) 2013 Google Inc. All rights reserved. 1 # Copyright (C) 2013 Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 28 matching lines...) Expand all
39 'wtf_unittest_helpers', 39 'wtf_unittest_helpers',
40 'wtf.gyp:wtf', 40 'wtf.gyp:wtf',
41 '../config.gyp:unittest_config', 41 '../config.gyp:unittest_config',
42 ], 42 ],
43 'sources': [ 43 'sources': [
44 '<@(wtf_unittest_files)', 44 '<@(wtf_unittest_files)',
45 ], 45 ],
46 # Disable c4267 warnings until we fix size_t to int truncations. 46 # Disable c4267 warnings until we fix size_t to int truncations.
47 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267], 47 'msvs_disabled_warnings': [4127, 4510, 4512, 4610, 4706, 4068, 4267],
48 'conditions': [ 48 'conditions': [
49 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_us e_tcmalloc==1', { 49 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
50 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_al locator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_u se_tcmalloc" and linux_use_tcmalloc==1))', {
50 'dependencies': [ 51 'dependencies': [
51 '<(DEPTH)/base/base.gyp:base', 52 '<(DEPTH)/base/base.gyp:base',
52 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 53 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
53 ], 54 ],
54 }], 55 }],
55 ['OS=="android" and gtest_target_type == "shared_library"', { 56 ['OS=="android" and gtest_target_type == "shared_library"', {
56 'type': 'shared_library', 57 'type': 'shared_library',
57 'dependencies': [ 58 'dependencies': [
58 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 59 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
59 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', 60 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 'wtf_unittests', 104 'wtf_unittests',
104 ], 105 ],
105 'variables': { 106 'variables': {
106 'test_suite_name': 'wtf_unittests', 107 'test_suite_name': 'wtf_unittests',
107 }, 108 },
108 'includes': [ '../../../../build/apk_test.gypi' ], 109 'includes': [ '../../../../build/apk_test.gypi' ],
109 }], 110 }],
110 }], 111 }],
111 ], 112 ],
112 } 113 }
OLDNEW
« no previous file with comments | « Source/web/web_tests.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698