Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Side by Side Diff: ui/ui.gyp

Issue 14472005: Fix dependency tree when using the system ICU. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add proper default for use_system_icu Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 852 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 ['OS=="linux"', { 863 ['OS=="linux"', {
864 'libraries': [ 864 'libraries': [
865 '-ldl', 865 '-ldl',
866 ], 866 ],
867 }], 867 }],
868 ['inside_chromium_build==0', { 868 ['inside_chromium_build==0', {
869 'dependencies': [ 869 'dependencies': [
870 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 870 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
871 ], 871 ],
872 }], 872 }],
873 ['use_system_icu==1', {
874 # When using the system icu, the icu targets generate shim headers
875 # which are included by public headers in the ui target, so we need
876 # ui to be a hard dependency for all its users.
877 'hard_dependency': 1,
878 }],
873 ], 879 ],
874 }, 880 },
875 ], 881 ],
876 'conditions': [ 882 'conditions': [
877 ['inside_chromium_build == 1', { 883 ['inside_chromium_build == 1', {
878 'includes': [ 884 'includes': [
879 'ui_unittests.gypi', 885 'ui_unittests.gypi',
880 ]}, 886 ]},
881 ], 887 ],
882 ['OS=="android"' , { 888 ['OS=="android"' , {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
985 'xcode_settings': { 991 'xcode_settings': {
986 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', 992 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO',
987 }, 993 },
988 }], 994 }],
989 ], 995 ],
990 }, 996 },
991 ], 997 ],
992 }], 998 }],
993 ], 999 ],
994 } 1000 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698