| 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 'nacl_win64_target': 0, | 7 'nacl_win64_target': 0, |
| 8 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 'gpu_common.gypi', | 10 'gpu_common.gypi', |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 'config/gpu_test_expectations_parser_unittest.cc', | 272 'config/gpu_test_expectations_parser_unittest.cc', |
| 273 'config/gpu_util_unittest.cc', | 273 'config/gpu_util_unittest.cc', |
| 274 ], | 274 ], |
| 275 'conditions': [ | 275 'conditions': [ |
| 276 ['OS == "android" and gtest_target_type == "shared_library"', { | 276 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 277 'dependencies': [ | 277 'dependencies': [ |
| 278 '../testing/android/native_test.gyp:native_test_native_code', | 278 '../testing/android/native_test.gyp:native_test_native_code', |
| 279 ], | 279 ], |
| 280 }], | 280 }], |
| 281 # See http://crbug.com/162998#c4 for why this is needed. | 281 # See http://crbug.com/162998#c4 for why this is needed. |
| 282 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 282 ['OS=="linux" and use_allocator!="none"', { |
| 283 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { | |
| 284 'dependencies': [ | 283 'dependencies': [ |
| 285 '../base/allocator/allocator.gyp:allocator', | 284 '../base/allocator/allocator.gyp:allocator', |
| 286 ], | 285 ], |
| 287 }], | 286 }], |
| 288 ], | 287 ], |
| 289 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 288 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 290 'msvs_disabled_warnings': [ 4267, ], | 289 'msvs_disabled_warnings': [ 4267, ], |
| 291 }, | 290 }, |
| 292 { | 291 { |
| 293 'target_name': 'gl_tests', | 292 'target_name': 'gl_tests', |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 'test_suite_name': 'gl_tests', | 595 'test_suite_name': 'gl_tests', |
| 597 }, | 596 }, |
| 598 'includes': [ | 597 'includes': [ |
| 599 '../build/apk_test.gypi', | 598 '../build/apk_test.gypi', |
| 600 ], | 599 ], |
| 601 }, | 600 }, |
| 602 ], | 601 ], |
| 603 }], | 602 }], |
| 604 ], | 603 ], |
| 605 } | 604 } |
| OLD | NEW |