| 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 'shell_dialogs.gypi', | 10 'shell_dialogs.gypi', |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 'libraries': [ | 576 'libraries': [ |
| 577 '-ldl', | 577 '-ldl', |
| 578 ], | 578 ], |
| 579 }], | 579 }], |
| 580 ['use_system_icu==1', { | 580 ['use_system_icu==1', { |
| 581 # When using the system icu, the icu targets generate shim headers | 581 # When using the system icu, the icu targets generate shim headers |
| 582 # which are included by public headers in the ui target, so we need | 582 # which are included by public headers in the ui target, so we need |
| 583 # ui to be a hard dependency for all its users. | 583 # ui to be a hard dependency for all its users. |
| 584 'hard_dependency': 1, | 584 'hard_dependency': 1, |
| 585 }], | 585 }], |
| 586 ['use_ozone==1', { |
| 587 'dependencies': [ |
| 588 'base/ozone/ozone.gyp:ozone', |
| 589 ], |
| 590 }], |
| 586 ], | 591 ], |
| 587 }, | 592 }, |
| 588 { | 593 { |
| 589 'target_name': 'webui_test_support', | 594 'target_name': 'webui_test_support', |
| 590 'type': 'none', | 595 'type': 'none', |
| 591 'direct_dependent_settings': { | 596 'direct_dependent_settings': { |
| 592 'include_dirs': [ | 597 'include_dirs': [ |
| 593 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', | 598 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources', |
| 594 ] | 599 ] |
| 595 } | 600 } |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 725 'xcode_settings': { | 730 'xcode_settings': { |
| 726 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', | 731 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', |
| 727 }, | 732 }, |
| 728 }], | 733 }], |
| 729 ], | 734 ], |
| 730 }, | 735 }, |
| 731 ], | 736 ], |
| 732 }], | 737 }], |
| 733 ], | 738 ], |
| 734 } | 739 } |
| OLD | NEW |