| 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 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 # TODO(michaelbai): Removed the below once the fix upstreamed. | 286 # TODO(michaelbai): Removed the below once the fix upstreamed. |
| 287 'memory/mru_cache_unittest.cc', | 287 'memory/mru_cache_unittest.cc', |
| 288 'process_util_unittest.cc', | 288 'process_util_unittest.cc', |
| 289 'synchronization/cancellation_flag_unittest.cc', | 289 'synchronization/cancellation_flag_unittest.cc', |
| 290 # TODO(michaelbai): The below files are excluded because of the | 290 # TODO(michaelbai): The below files are excluded because of the |
| 291 # missing JNI and should be added back once JNI is ready. | 291 # missing JNI and should be added back once JNI is ready. |
| 292 'android/jni_android_unittest.cc', | 292 'android/jni_android_unittest.cc', |
| 293 'android/scoped_java_ref_unittest.cc', | 293 'android/scoped_java_ref_unittest.cc', |
| 294 'debug/stack_trace_unittest.cc', | 294 'debug/stack_trace_unittest.cc', |
| 295 ], | 295 ], |
| 296 'dependencies': [ |
| 297 'android/jni_generator/jni_generator.gyp:jni_generator_py_tests', |
| 298 ], |
| 296 }], | 299 }], |
| 297 ['use_glib==1', { | 300 ['use_glib==1', { |
| 298 'sources!': [ | 301 'sources!': [ |
| 299 'file_version_info_unittest.cc', | 302 'file_version_info_unittest.cc', |
| 300 ], | 303 ], |
| 301 'conditions': [ | 304 'conditions': [ |
| 302 [ 'linux_use_tcmalloc==1', { | 305 [ 'linux_use_tcmalloc==1', { |
| 303 'dependencies': [ | 306 'dependencies': [ |
| 304 'allocator/allocator.gyp:allocator', | 307 'allocator/allocator.gyp:allocator', |
| 305 ], | 308 ], |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 'msvs_settings': { | 469 'msvs_settings': { |
| 467 'VCLinkerTool': { | 470 'VCLinkerTool': { |
| 468 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 471 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 469 }, | 472 }, |
| 470 }, | 473 }, |
| 471 }, | 474 }, |
| 472 ], | 475 ], |
| 473 }], | 476 }], |
| 474 ], | 477 ], |
| 475 } | 478 } |
| OLD | NEW |