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

Side by Side Diff: Source/platform/blink_platform_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/heap/blink_heap_tests.gyp ('k') | Source/web/web_tests.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 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'defines': [ 48 'defines': [
49 'INSIDE_BLINK', 49 'INSIDE_BLINK',
50 ], 50 ],
51 'include_dirs': [ 51 'include_dirs': [
52 '<(SHARED_INTERMEDIATE_DIR)/blink', 52 '<(SHARED_INTERMEDIATE_DIR)/blink',
53 ], 53 ],
54 'sources': [ 54 'sources': [
55 '<@(platform_test_files)', 55 '<@(platform_test_files)',
56 ], 56 ],
57 'conditions': [ 57 'conditions': [
58 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and linux_use_ tcmalloc==1', { 58 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
59 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and ((use_allo cator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use _tcmalloc" and linux_use_tcmalloc==1))', {
59 'dependencies': [ 60 'dependencies': [
60 '<(DEPTH)/base/base.gyp:base', 61 '<(DEPTH)/base/base.gyp:base',
61 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 62 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
62 ] 63 ]
63 }], 64 }],
64 ['OS=="android" and gtest_target_type == "shared_library"', { 65 ['OS=="android" and gtest_target_type == "shared_library"', {
65 'type': 'shared_library', 66 'type': 'shared_library',
66 'dependencies': [ 67 'dependencies': [
67 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 68 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
68 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', 69 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
(...skipping 12 matching lines...) Expand all
81 'blink_platform_unittests', 82 'blink_platform_unittests',
82 ], 83 ],
83 'variables': { 84 'variables': {
84 'test_suite_name': 'blink_platform_unittests', 85 'test_suite_name': 'blink_platform_unittests',
85 }, 86 },
86 'includes': [ '../../../../build/apk_test.gypi' ], 87 'includes': [ '../../../../build/apk_test.gypi' ],
87 }], 88 }],
88 }], 89 }],
89 ], 90 ],
90 } 91 }
OLDNEW
« no previous file with comments | « Source/heap/blink_heap_tests.gyp ('k') | Source/web/web_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698