| 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 'icon_util.h', | 344 'icon_util.h', |
| 345 ], | 345 ], |
| 346 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int | 346 # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int |
| 347 # C4324 is structure was padded due to __declspec(align()), which is | 347 # C4324 is structure was padded due to __declspec(align()), which is |
| 348 # uninteresting. | 348 # uninteresting. |
| 349 'msvs_disabled_warnings': [ 4267, 4324 ], | 349 'msvs_disabled_warnings': [ 4267, 4324 ], |
| 350 }], | 350 }], |
| 351 ['OS=="android"', { | 351 ['OS=="android"', { |
| 352 'sources!': [ | 352 'sources!': [ |
| 353 'animation/throb_animation.cc', | 353 'animation/throb_animation.cc', |
| 354 'display_observer.cc', | |
| 355 'selection_model.cc', | 354 'selection_model.cc', |
| 356 ], | 355 ], |
| 357 'dependencies': [ | 356 'dependencies': [ |
| 358 'gfx_jni_headers', | 357 'gfx_jni_headers', |
| 359 ], | 358 ], |
| 360 'link_settings': { | 359 'link_settings': { |
| 361 'libraries': [ | 360 'libraries': [ |
| 362 '-landroid', | 361 '-landroid', |
| 363 '-ljnigraphics', | 362 '-ljnigraphics', |
| 364 ], | 363 ], |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 ], | 480 ], |
| 482 'variables': { | 481 'variables': { |
| 483 'jni_gen_package': 'ui/gfx', | 482 'jni_gen_package': 'ui/gfx', |
| 484 }, | 483 }, |
| 485 'includes': [ '../../build/jni_generator.gypi' ], | 484 'includes': [ '../../build/jni_generator.gypi' ], |
| 486 }, | 485 }, |
| 487 ], | 486 ], |
| 488 }], | 487 }], |
| 489 ], | 488 ], |
| 490 } | 489 } |
| OLD | NEW |