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

Side by Side Diff: third_party/WebKit/Source/web/web_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: pure rebase Created 4 years, 10 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) 2011 Google Inc. All rights reserved. 2 # Copyright (C) 2011 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 ['OS=="win" and component!="shared_library"', { 92 ['OS=="win" and component!="shared_library"', {
93 'configurations': { 93 'configurations': {
94 'Debug_Base': { 94 'Debug_Base': {
95 'msvs_settings': { 95 'msvs_settings': {
96 'VCLinkerTool': { 96 'VCLinkerTool': {
97 'LinkIncremental': '<(msvs_large_module_debu g_link_mode)', 97 'LinkIncremental': '<(msvs_large_module_debu g_link_mode)',
98 }, 98 },
99 }, 99 },
100 }, 100 },
101 }, 101 },
102 'conditions': [
103 ['win_use_allocator_shim==1', {
104 'dependencies': [
105 '<(DEPTH)/base/allocator/allocator.gyp:allocator ',
106 ],
107 }],
108 ],
109 }], 102 }],
110 ['OS=="android"', { 103 ['OS=="android"', {
111 'type': 'shared_library', 104 'type': 'shared_library',
112 'dependencies': [ 105 'dependencies': [
113 '<(DEPTH)/testing/android/native_test.gyp:native_test_na tive_code', 106 '<(DEPTH)/testing/android/native_test.gyp:native_test_na tive_code',
114 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forward er2', 107 '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forward er2',
115 ], 108 ],
116 }], 109 }],
117 ['OS=="mac"', { 110 ['OS=="mac"', {
118 'include_dirs': [ 111 'include_dirs': [
119 '../../public/web/mac', 112 '../../public/web/mac',
120 ], 113 ],
121 }], 114 }],
122 [ 'os_posix==1 and OS!="mac" and OS!="android" and OS!="ios" and use_allocator!="none"', {
123 'dependencies': [
124 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
125 ],
126 }],
127 ], 115 ],
128 } 116 }
129 ], # targets 117 ], # targets
130 'conditions': [ 118 'conditions': [
131 ['OS=="android" and gtest_target_type == "shared_library"', { 119 ['OS=="android" and gtest_target_type == "shared_library"', {
132 # Wrap libwebkit_unit_tests.so into an android apk for execution. 120 # Wrap libwebkit_unit_tests.so into an android apk for execution.
133 'targets': [{ 121 'targets': [{
134 'target_name': 'webkit_unit_tests_apk', 122 'target_name': 'webkit_unit_tests_apk',
135 'type': 'none', 123 'type': 'none',
136 'dependencies': [ 124 'dependencies': [
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 '../../../../build/isolate.gypi', 159 '../../../../build/isolate.gypi',
172 ], 160 ],
173 'sources': [ 161 'sources': [
174 'webkit_unit_tests.isolate', 162 'webkit_unit_tests.isolate',
175 ], 163 ],
176 }, 164 },
177 ], 165 ],
178 }], 166 }],
179 ], 167 ],
180 } 168 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform_tests.gyp ('k') | third_party/WebKit/Source/wtf/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698