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

Side by Side Diff: gpu/gpu.gyp

Issue 16360018: Add allocator.gyp target to gpu_unittests to fix heapcheck build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 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 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 'config/gpu_test_config_unittest.cc', 221 'config/gpu_test_config_unittest.cc',
222 'config/gpu_test_expectations_parser_unittest.cc', 222 'config/gpu_test_expectations_parser_unittest.cc',
223 'config/gpu_util_unittest.cc', 223 'config/gpu_util_unittest.cc',
224 ], 224 ],
225 'conditions': [ 225 'conditions': [
226 ['OS == "android" and gtest_target_type == "shared_library"', { 226 ['OS == "android" and gtest_target_type == "shared_library"', {
227 'dependencies': [ 227 'dependencies': [
228 '../testing/android/native_test.gyp:native_test_native_code', 228 '../testing/android/native_test.gyp:native_test_native_code',
229 ], 229 ],
230 }], 230 }],
231 # See http://crbug.com/162998#c4 for why this is needed.
232 ['OS=="linux" and linux_use_tcmalloc==1', {
233 'dependencies': [
234 '../base/allocator/allocator.gyp:allocator',
235 ],
236 }],
231 ], 237 ],
232 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 238 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
233 'msvs_disabled_warnings': [ 4267, ], 239 'msvs_disabled_warnings': [ 4267, ],
234 }, 240 },
235 { 241 {
236 'target_name': 'gl_tests', 242 'target_name': 'gl_tests',
237 'type': '<(gtest_target_type)', 243 'type': '<(gtest_target_type)',
238 'dependencies': [ 244 'dependencies': [
239 '../base/base.gyp:base', 245 '../base/base.gyp:base',
240 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 246 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 538 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
533 }, 539 },
534 'includes': [ 540 'includes': [
535 '../build/apk_test.gypi', 541 '../build/apk_test.gypi',
536 ], 542 ],
537 }, 543 },
538 ], 544 ],
539 }], 545 }],
540 ], 546 ],
541 } 547 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698