Chromium Code Reviews| 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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 238 # Mac target to build a test Framework bundle to mock out resource loading. | 238 # Mac target to build a test Framework bundle to mock out resource loading. |
| 239 ['OS == "mac"', { | 239 ['OS == "mac"', { |
| 240 'targets': [ | 240 'targets': [ |
| 241 { | 241 { |
| 242 'target_name': 'ui_base_tests_bundle', | 242 'target_name': 'ui_base_tests_bundle', |
| 243 'type': 'shared_library', | 243 'type': 'shared_library', |
| 244 'dependencies': [ | 244 'dependencies': [ |
| 245 '../resources/ui_resources.gyp:ui_test_pak', | 245 '../resources/ui_resources.gyp:ui_test_pak', |
| 246 ], | 246 ], |
| 247 'includes': [ 'ui_base_tests_bundle.gypi' ], | 247 'includes': [ 'ui_base_tests_bundle.gypi' ], |
| 248 # ui_base_tests_bundle doesn't actually contain a shared library and | |
|
Nico
2015/09/17 04:12:01
…wouldn't it be a better fix to make this target n
| |
| 249 # therefore should not depend on sanitizer_options or any other | |
| 250 # libraries. Adding such a dependency will result in creating a | |
| 251 # broken shared library within the bundle. | |
| 252 'conditions': [ | |
| 253 ['use_sanitizer_options==1', { | |
| 254 'dependencies!': [ | |
| 255 '../../build/sanitizers/sanitizers.gyp:sanitizer_options', | |
| 256 ], | |
| 257 }], | |
| 258 ], | |
| 248 }, | 259 }, |
| 249 ], | 260 ], |
| 250 }], | 261 }], |
| 251 ['OS == "android"', { | 262 ['OS == "android"', { |
| 252 'targets': [ | 263 'targets': [ |
| 253 { | 264 { |
| 254 'target_name': 'ui_unittests_apk', | 265 'target_name': 'ui_unittests_apk', |
| 255 'type': 'none', | 266 'type': 'none', |
| 256 'dependencies': [ | 267 'dependencies': [ |
| 257 'ui_unittests', | 268 'ui_unittests', |
| 258 ], | 269 ], |
| 259 'variables': { | 270 'variables': { |
| 260 'test_suite_name': 'ui_unittests', | 271 'test_suite_name': 'ui_unittests', |
| 261 }, | 272 }, |
| 262 'includes': [ '../../build/apk_test.gypi' ], | 273 'includes': [ '../../build/apk_test.gypi' ], |
| 263 }, | 274 }, |
| 264 ], | 275 ], |
| 265 }], | 276 }], |
| 266 ], | 277 ], |
| 267 } | 278 } |
| OLD | NEW |