| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 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 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 }, | 128 }, |
| 129 'link_settings': { | 129 'link_settings': { |
| 130 'libraries': [ | 130 'libraries': [ |
| 131 '-limm32.lib', | 131 '-limm32.lib', |
| 132 '-loleacc.lib', | 132 '-loleacc.lib', |
| 133 ], | 133 ], |
| 134 }, | 134 }, |
| 135 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 135 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 136 'msvs_disabled_warnings': [ 4267, ], | 136 'msvs_disabled_warnings': [ 4267, ], |
| 137 }], | 137 }], |
| 138 ['OS == "android"', { | |
| 139 'sources': [ | |
| 140 'gfx/android/scroller_unittest.cc', | |
| 141 ], | |
| 142 }], | |
| 143 ['OS == "android" and gtest_target_type == "shared_library"', { | 138 ['OS == "android" and gtest_target_type == "shared_library"', { |
| 144 'dependencies': [ | 139 'dependencies': [ |
| 145 '../testing/android/native_test.gyp:native_test_native_code', | 140 '../testing/android/native_test.gyp:native_test_native_code', |
| 146 ], | 141 ], |
| 147 }], | 142 }], |
| 148 ['use_pango == 1', { | 143 ['use_pango == 1', { |
| 149 'dependencies': [ | 144 'dependencies': [ |
| 150 '../build/linux/system.gyp:fontconfig', | 145 '../build/linux/system.gyp:fontconfig', |
| 151 '../build/linux/system.gyp:pangocairo', | 146 '../build/linux/system.gyp:pangocairo', |
| 152 ], | 147 ], |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 ], | 265 ], |
| 271 'variables': { | 266 'variables': { |
| 272 'test_suite_name': 'ui_unittests', | 267 'test_suite_name': 'ui_unittests', |
| 273 }, | 268 }, |
| 274 'includes': [ '../build/apk_test.gypi' ], | 269 'includes': [ '../build/apk_test.gypi' ], |
| 275 }, | 270 }, |
| 276 ], | 271 ], |
| 277 }], | 272 }], |
| 278 ], | 273 ], |
| 279 } | 274 } |
| OLD | NEW |