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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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/temp_gyp/googleurl.gyp ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
11 'dependencies': [ 11 'dependencies': [
12 # NOTE: New dependencies should generally be added in the OS!="ios" 12 # NOTE: New dependencies should generally be added in the OS!="ios"
13 # dependencies block below, rather than here. 13 # dependencies block below, rather than here.
14 'browser/search_engines/prepopulated_engines.gyp:prepopulated_engines', 14 'browser/search_engines/prepopulated_engines.gyp:prepopulated_engines',
15 'browser_ui', 15 'browser_ui',
16 'cert_logger_proto', 16 'cert_logger_proto',
17 'chrome_resources.gyp:chrome_extra_resources', 17 'chrome_resources.gyp:chrome_extra_resources',
18 'chrome_resources.gyp:chrome_resources', 18 'chrome_resources.gyp:chrome_resources',
19 'chrome_resources.gyp:chrome_strings', 19 'chrome_resources.gyp:chrome_strings',
20 'chrome_resources.gyp:platform_locale_settings', 20 'chrome_resources.gyp:platform_locale_settings',
21 'chrome_resources.gyp:theme_resources', 21 'chrome_resources.gyp:theme_resources',
22 'common', 22 'common',
23 'common_net', 23 'common_net',
24 'feedback_proto', 24 'feedback_proto',
25 'in_memory_url_index_cache_proto', 25 'in_memory_url_index_cache_proto',
26 'safe_browsing_proto', 26 'safe_browsing_proto',
27 'safe_browsing_report_proto', 27 'safe_browsing_report_proto',
28 'variations_seed_proto', 28 'variations_seed_proto',
29 '../build/temp_gyp/googleurl.gyp:googleurl',
30 '../components/components.gyp:browser_context_keyed_service', 29 '../components/components.gyp:browser_context_keyed_service',
31 '../components/components.gyp:encryptor', 30 '../components/components.gyp:encryptor',
32 '../components/components.gyp:sessions', 31 '../components/components.gyp:sessions',
33 '../components/components.gyp:user_prefs', 32 '../components/components.gyp:user_prefs',
34 '../components/components.gyp:visitedlink_browser', 33 '../components/components.gyp:visitedlink_browser',
35 '../components/components.gyp:visitedlink_common', 34 '../components/components.gyp:visitedlink_common',
35 '../components/components.gyp:web_modal',
36 '../components/components.gyp:webdata_common', 36 '../components/components.gyp:webdata_common',
37 '../components/components.gyp:web_modal',
38 '../content/content.gyp:content_browser', 37 '../content/content.gyp:content_browser',
39 '../content/content.gyp:content_common', 38 '../content/content.gyp:content_common',
40 '../crypto/crypto.gyp:crypto', 39 '../crypto/crypto.gyp:crypto',
41 '../google_apis/google_apis.gyp:google_apis', 40 '../google_apis/google_apis.gyp:google_apis',
42 '../jingle/jingle.gyp:notifier', 41 '../jingle/jingle.gyp:notifier',
43 '../media/media.gyp:media', 42 '../media/media.gyp:media',
44 '../skia/skia.gyp:skia', 43 '../skia/skia.gyp:skia',
45 '../sql/sql.gyp:sql', 44 '../sql/sql.gyp:sql',
46 '../sync/sync.gyp:sync', 45 '../sync/sync.gyp:sync',
47 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 46 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
48 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', 47 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp',
49 '../third_party/icu/icu.gyp:icui18n', 48 '../third_party/icu/icu.gyp:icui18n',
50 '../third_party/icu/icu.gyp:icuuc', 49 '../third_party/icu/icu.gyp:icuuc',
51 '../third_party/libjingle/libjingle.gyp:libjingle', 50 '../third_party/libjingle/libjingle.gyp:libjingle',
52 '../third_party/libxml/libxml.gyp:libxml', 51 '../third_party/libxml/libxml.gyp:libxml',
53 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 52 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
53 '../third_party/zlib/zlib.gyp:minizip',
54 '../third_party/zlib/zlib.gyp:zip', 54 '../third_party/zlib/zlib.gyp:zip',
55 '../third_party/zlib/zlib.gyp:minizip',
56 '../third_party/zlib/zlib.gyp:zlib', 55 '../third_party/zlib/zlib.gyp:zlib',
57 '../ui/base/strings/ui_strings.gyp:ui_strings', 56 '../ui/base/strings/ui_strings.gyp:ui_strings',
58 '../ui/message_center/message_center.gyp:message_center', 57 '../ui/message_center/message_center.gyp:message_center',
59 '../ui/ui.gyp:shell_dialogs', 58 '../ui/ui.gyp:shell_dialogs',
60 '../ui/ui.gyp:ui', 59 '../ui/ui.gyp:ui',
61 '../ui/ui.gyp:ui_resources', 60 '../ui/ui.gyp:ui_resources',
62 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 61 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
63 ], 62 ],
64 'include_dirs': [ 63 'include_dirs': [
65 '..', 64 '..',
(...skipping 3194 matching lines...) Expand 10 before | Expand all | Expand 10 after
3260 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3259 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3261 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3260 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3262 }, 3261 },
3263 'includes': [ '../build/android/java_cpp_template.gypi' ], 3262 'includes': [ '../build/android/java_cpp_template.gypi' ],
3264 }, 3263 },
3265 ], 3264 ],
3266 }, 3265 },
3267 ], 3266 ],
3268 ], 3267 ],
3269 } 3268 }
OLDNEW
« no previous file with comments | « build/temp_gyp/googleurl.gyp ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698