| 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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 'config/gpu_test_config_unittest.cc', | 271 'config/gpu_test_config_unittest.cc', |
| 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"', { | 276 ['OS == "android"', { |
| 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. | |
| 282 ['OS=="linux" and use_allocator!="none"', { | |
| 283 'dependencies': [ | |
| 284 '../base/allocator/allocator.gyp:allocator', | |
| 285 ], | |
| 286 }], | |
| 287 ], | 281 ], |
| 288 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 282 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 289 'msvs_disabled_warnings': [ 4267, ], | 283 'msvs_disabled_warnings': [ 4267, ], |
| 290 }, | 284 }, |
| 291 { | 285 { |
| 292 # GN version: //gpu/gpu_perftests | 286 # GN version: //gpu/gpu_perftests |
| 293 'target_name': 'gpu_perftests', | 287 'target_name': 'gpu_perftests', |
| 294 'type': '<(gtest_target_type)', | 288 'type': '<(gtest_target_type)', |
| 295 'dependencies': [ | 289 'dependencies': [ |
| 296 '../base/base.gyp:base', | 290 '../base/base.gyp:base', |
| (...skipping 11 matching lines...) Expand all Loading... |
| 308 'perftests/texture_upload_perftest.cc', | 302 'perftests/texture_upload_perftest.cc', |
| 309 ], | 303 ], |
| 310 'conditions': [ | 304 'conditions': [ |
| 311 ['OS == "android"', | 305 ['OS == "android"', |
| 312 { | 306 { |
| 313 'dependencies': [ | 307 'dependencies': [ |
| 314 '../testing/android/native_test.gyp:native_test_native_code', | 308 '../testing/android/native_test.gyp:native_test_native_code', |
| 315 ], | 309 ], |
| 316 } | 310 } |
| 317 ], | 311 ], |
| 318 # See http://crbug.com/162998#c4 for why this is needed. | |
| 319 ['OS=="linux" and use_allocator!="none"', | |
| 320 { | |
| 321 'dependencies': [ | |
| 322 '../base/allocator/allocator.gyp:allocator', | |
| 323 ], | |
| 324 } | |
| 325 ], | |
| 326 ], | 312 ], |
| 327 }, | 313 }, |
| 328 { | 314 { |
| 329 # GN version: //gpu:gl_tests | 315 # GN version: //gpu:gl_tests |
| 330 'target_name': 'gl_tests', | 316 'target_name': 'gl_tests', |
| 331 'type': '<(gtest_target_type)', | 317 'type': '<(gtest_target_type)', |
| 332 'dependencies': [ | 318 'dependencies': [ |
| 333 '../base/base.gyp:base', | 319 '../base/base.gyp:base', |
| 334 '../base/base.gyp:test_support_base', | 320 '../base/base.gyp:test_support_base', |
| 335 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 321 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| (...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 917 ], | 903 ], |
| 918 'sources': [ | 904 'sources': [ |
| 919 'gpu_unittests_apk.isolate', | 905 'gpu_unittests_apk.isolate', |
| 920 ], | 906 ], |
| 921 }, | 907 }, |
| 922 ], | 908 ], |
| 923 }, | 909 }, |
| 924 ], | 910 ], |
| 925 ], | 911 ], |
| 926 } | 912 } |
| OLD | NEW |