| 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 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 ], | 720 ], |
| 721 }, | 721 }, |
| 722 }], | 722 }], |
| 723 ['use_x11==1', { | 723 ['use_x11==1', { |
| 724 'all_dependent_settings': { | 724 'all_dependent_settings': { |
| 725 'ldflags': [ | 725 'ldflags': [ |
| 726 '-L<(PRODUCT_DIR)', | 726 '-L<(PRODUCT_DIR)', |
| 727 ], | 727 ], |
| 728 'link_settings': { | 728 'link_settings': { |
| 729 'libraries': [ | 729 'libraries': [ |
| 730 '-lX11 -lXcursor', | 730 '-lX11', |
| 731 '-lXcursor', |
| 732 '-lXrandr', # For XRR* function calls in x11_util.cc. |
| 731 ], | 733 ], |
| 732 }, | 734 }, |
| 733 }, | 735 }, |
| 734 }, { # use_x11==0 | 736 }, { # use_x11==0 |
| 735 'sources/': [ | 737 'sources/': [ |
| 736 ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'], | 738 ['exclude', 'base/keycodes/keyboard_code_conversion_x.*'], |
| 737 ['exclude', 'base/x/*'], | 739 ['exclude', 'base/x/*'], |
| 738 ], | 740 ], |
| 739 }], | 741 }], |
| 740 ['toolkit_views==0', { | 742 ['toolkit_views==0', { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 777 ], | 779 ], |
| 778 'conditions': [ | 780 'conditions': [ |
| 779 ['inside_chromium_build == 1 and OS != "ios"', { | 781 ['inside_chromium_build == 1 and OS != "ios"', { |
| 780 # TODO(ios): The ui tests do not compile yet on iOS. | 782 # TODO(ios): The ui tests do not compile yet on iOS. |
| 781 'includes': [ | 783 'includes': [ |
| 782 'ui_unittests.gypi', | 784 'ui_unittests.gypi', |
| 783 ]}, | 785 ]}, |
| 784 ], | 786 ], |
| 785 ], | 787 ], |
| 786 } | 788 } |
| OLD | NEW |