| OLD | NEW |
| 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 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'cc_unit_tests_source_files': [ | 8 'cc_unit_tests_source_files': [ |
| 9 'animation/animation_unittest.cc', | 9 'animation/animation_unittest.cc', |
| 10 'animation/keyframed_animation_curve_unittest.cc', | 10 'animation/keyframed_animation_curve_unittest.cc', |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 ['OS == "android" and gtest_target_type == "shared_library"', | 261 ['OS == "android" and gtest_target_type == "shared_library"', |
| 262 { | 262 { |
| 263 'dependencies': [ | 263 'dependencies': [ |
| 264 '../testing/android/native_test.gyp:native_test_native_code', | 264 '../testing/android/native_test.gyp:native_test_native_code', |
| 265 ], | 265 ], |
| 266 } | 266 } |
| 267 ], | 267 ], |
| 268 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', | 268 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', |
| 269 { | 269 { |
| 270 'conditions': [ | 270 'conditions': [ |
| 271 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/34555
4 | 271 [ 'use_allocator!="none"', |
| 272 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") o
r (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', | |
| 273 { | 272 { |
| 274 'dependencies': [ | 273 'dependencies': [ |
| 275 '../base/allocator/allocator.gyp:allocator', | 274 '../base/allocator/allocator.gyp:allocator', |
| 276 ], | 275 ], |
| 277 } | 276 } |
| 278 ], | 277 ], |
| 279 ], | 278 ], |
| 280 } | 279 } |
| 281 ], | 280 ], |
| 282 ], | 281 ], |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 ], | 320 ], |
| 322 'conditions': [ | 321 'conditions': [ |
| 323 ['OS == "android" and gtest_target_type == "shared_library"', | 322 ['OS == "android" and gtest_target_type == "shared_library"', |
| 324 { | 323 { |
| 325 'dependencies': [ | 324 'dependencies': [ |
| 326 '../testing/android/native_test.gyp:native_test_native_code', | 325 '../testing/android/native_test.gyp:native_test_native_code', |
| 327 ], | 326 ], |
| 328 } | 327 } |
| 329 ], | 328 ], |
| 330 # See http://crbug.com/162998#c4 for why this is needed. | 329 # See http://crbug.com/162998#c4 for why this is needed. |
| 331 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 330 ['OS=="linux" and use_allocator!="none"', |
| 332 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', | |
| 333 { | 331 { |
| 334 'dependencies': [ | 332 'dependencies': [ |
| 335 '../base/allocator/allocator.gyp:allocator', | 333 '../base/allocator/allocator.gyp:allocator', |
| 336 ], | 334 ], |
| 337 } | 335 } |
| 338 ], | 336 ], |
| 339 ], | 337 ], |
| 340 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 338 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 341 'msvs_disabled_warnings': [ 4267, ], | 339 'msvs_disabled_warnings': [ 4267, ], |
| 342 }, | 340 }, |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 'variables': { | 396 'variables': { |
| 399 'test_suite_name': 'cc_perftests', | 397 'test_suite_name': 'cc_perftests', |
| 400 }, | 398 }, |
| 401 'includes': [ '../build/apk_test.gypi' ], | 399 'includes': [ '../build/apk_test.gypi' ], |
| 402 }, | 400 }, |
| 403 ], | 401 ], |
| 404 } | 402 } |
| 405 ] | 403 ] |
| 406 ], | 404 ], |
| 407 } | 405 } |
| OLD | NEW |