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

Side by Side Diff: third_party/WebKit/Source/platform/blink_platform_tests.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'blink_platform.gyp:blink_platform', 46 'blink_platform.gyp:blink_platform',
47 ], 47 ],
48 'defines': [ 48 'defines': [
49 'INSIDE_BLINK', 49 'INSIDE_BLINK',
50 ], 50 ],
51 'sources': [ 51 'sources': [
52 'heap/RunAllTests.cpp', 52 'heap/RunAllTests.cpp',
53 '<@(platform_heap_test_files)', 53 '<@(platform_heap_test_files)',
54 ], 54 ],
55 'conditions': [ 55 'conditions': [
56 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allo cator!="none"', {
57 'dependencies': [
58 '<(DEPTH)/base/base.gyp:base',
petrcermak 2016/01/28 14:58:50 Is the dependency on base supposed to be removed a
Primiano Tucci (use gerrit) 2016/01/28 15:20:03 Yup it is redundant as they get it via test_suppor
59 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
60 ]
61 }],
62 ['OS=="win" and component!="shared_library" and win_use_allocator_shim== 1', {
63 'dependencies': [
64 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
65 ]
66 }],
67 ['OS=="android"', { 56 ['OS=="android"', {
68 'type': 'shared_library', 57 'type': 'shared_library',
69 'dependencies': [ 58 'dependencies': [
70 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 59 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
71 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', 60 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
72 ], 61 ],
73 }], 62 }],
74 ], 63 ],
75 }, 64 },
76 { 65 {
(...skipping 20 matching lines...) Expand all
97 'INSIDE_BLINK', 86 'INSIDE_BLINK',
98 ], 87 ],
99 'include_dirs': [ 88 'include_dirs': [
100 '<(SHARED_INTERMEDIATE_DIR)/blink', 89 '<(SHARED_INTERMEDIATE_DIR)/blink',
101 ], 90 ],
102 'sources': [ 91 'sources': [
103 'testing/RunAllTests.cpp', 92 'testing/RunAllTests.cpp',
104 '<@(platform_test_files)', 93 '<@(platform_test_files)',
105 ], 94 ],
106 'conditions': [ 95 'conditions': [
107 ['os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allo cator!="none"', {
108 'dependencies': [
109 '<(DEPTH)/base/base.gyp:base',
petrcermak 2016/01/28 14:58:50 ditto
Primiano Tucci (use gerrit) 2016/01/28 15:20:03 Ack.
110 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
111 ]
112 }],
113 ['OS=="android" and gtest_target_type == "shared_library"', { 96 ['OS=="android" and gtest_target_type == "shared_library"', {
114 'type': 'shared_library', 97 'type': 'shared_library',
115 'dependencies': [ 98 'dependencies': [
116 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 99 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
117 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2', 100 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
118 ], 101 ],
119 }], 102 }],
120 ], 103 ],
121 }, 104 },
122 { 105 {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 '../../../../build/isolate.gypi', 209 '../../../../build/isolate.gypi',
227 ], 210 ],
228 'sources': [ 211 'sources': [
229 'blink_platform_unittests.isolate', 212 'blink_platform_unittests.isolate',
230 ], 213 ],
231 } 214 }
232 ], 215 ],
233 }], 216 }],
234 ], 217 ],
235 } 218 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698