Chromium Code Reviews| 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 'ui_resources.gypi', | 10 'ui_resources.gypi', |
| (...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 571 'libraries': [ | 571 'libraries': [ |
| 572 '-ldl', | 572 '-ldl', |
| 573 ], | 573 ], |
| 574 }], | 574 }], |
| 575 ['use_system_icu==1', { | 575 ['use_system_icu==1', { |
| 576 # When using the system icu, the icu targets generate shim headers | 576 # When using the system icu, the icu targets generate shim headers |
| 577 # which are included by public headers in the ui target, so we need | 577 # which are included by public headers in the ui target, so we need |
| 578 # ui to be a hard dependency for all its users. | 578 # ui to be a hard dependency for all its users. |
| 579 'hard_dependency': 1, | 579 'hard_dependency': 1, |
| 580 }], | 580 }], |
| 581 ['use_ozone==1', { | |
| 582 'dependencies': [ | |
| 583 'ozone/ozone.gyp:ozone', | |
|
Ben Goodger (Google)
2013/10/30 23:56:09
is this still needed?
spang
2013/10/31 00:38:24
No, removed.
| |
| 584 ], | |
| 585 }], | |
| 581 ], | 586 ], |
| 582 }, | 587 }, |
| 583 { | 588 { |
| 584 'target_name': 'webui_test_support', | 589 'target_name': 'webui_test_support', |
| 585 'type': 'none', | 590 'type': 'none', |
| 586 'direct_dependent_settings': { | 591 'direct_dependent_settings': { |
| 587 'include_dirs': [ | 592 'include_dirs': [ |
| 588 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', | 593 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', |
| 589 ] | 594 ] |
| 590 } | 595 } |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 720 'xcode_settings': { | 725 'xcode_settings': { |
| 721 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', | 726 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
| 722 }, | 727 }, |
| 723 }], | 728 }], |
| 724 ], | 729 ], |
| 725 }, | 730 }, |
| 726 ], | 731 ], |
| 727 }], | 732 }], |
| 728 ], | 733 ], |
| 729 } | 734 } |
| OLD | NEW |