| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 'sources': [ | 329 'sources': [ |
| 330 'gdi_util.cc', | 330 'gdi_util.cc', |
| 331 'gdi_util.h', | 331 'gdi_util.h', |
| 332 'icon_util.cc', | 332 'icon_util.cc', |
| 333 'icon_util.h', | 333 'icon_util.h', |
| 334 ], | 334 ], |
| 335 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int | 335 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int |
| 336 # C4324 is structure was padded due to __declspec(align()), which is | 336 # C4324 is structure was padded due to __declspec(align()), which is |
| 337 # uninteresting. | 337 # uninteresting. |
| 338 'msvs_disabled_warnings': [ 4267, 4324 ], | 338 'msvs_disabled_warnings': [ 4267, 4324 ], |
| 339 | |
| 340 'msvs_settings': { | |
| 341 'VCCLCompilerTool': { | |
| 342 'ForcedIncludeFiles': [ 'build/intsafe_workaround.h' ], | |
| 343 }, | |
| 344 }, | |
| 345 }], | 339 }], |
| 346 ['OS=="android"', { | 340 ['OS=="android"', { |
| 347 'sources!': [ | 341 'sources!': [ |
| 348 'animation/throb_animation.cc', | 342 'animation/throb_animation.cc', |
| 349 'display_observer.cc', | 343 'display_observer.cc', |
| 350 'path.cc', | 344 'path.cc', |
| 351 'selection_model.cc', | 345 'selection_model.cc', |
| 352 ], | 346 ], |
| 353 'dependencies': [ | 347 'dependencies': [ |
| 354 'gfx_jni_headers', | 348 'gfx_jni_headers', |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 ], | 405 ], |
| 412 'variables': { | 406 'variables': { |
| 413 'jni_gen_package': 'ui/gfx', | 407 'jni_gen_package': 'ui/gfx', |
| 414 }, | 408 }, |
| 415 'includes': [ '../../build/jni_generator.gypi' ], | 409 'includes': [ '../../build/jni_generator.gypi' ], |
| 416 }, | 410 }, |
| 417 ], | 411 ], |
| 418 }], | 412 }], |
| 419 ], | 413 ], |
| 420 } | 414 } |
| OLD | NEW |