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

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: 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
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:encryptor', 29 '../components/components.gyp:encryptor',
31 '../components/components.gyp:sessions', 30 '../components/components.gyp:sessions',
32 '../components/components.gyp:user_prefs', 31 '../components/components.gyp:user_prefs',
33 '../components/components.gyp:visitedlink_browser', 32 '../components/components.gyp:visitedlink_browser',
34 '../components/components.gyp:visitedlink_common', 33 '../components/components.gyp:visitedlink_common',
34 '../components/components.gyp:web_modal',
35 '../components/components.gyp:webdata_common', 35 '../components/components.gyp:webdata_common',
36 '../components/components.gyp:web_modal',
37 '../content/content.gyp:content_browser', 36 '../content/content.gyp:content_browser',
38 '../content/content.gyp:content_common', 37 '../content/content.gyp:content_common',
39 '../crypto/crypto.gyp:crypto', 38 '../crypto/crypto.gyp:crypto',
40 '../google_apis/google_apis.gyp:google_apis', 39 '../google_apis/google_apis.gyp:google_apis',
41 '../jingle/jingle.gyp:notifier', 40 '../jingle/jingle.gyp:notifier',
42 '../media/media.gyp:media', 41 '../media/media.gyp:media',
43 '../skia/skia.gyp:skia', 42 '../skia/skia.gyp:skia',
44 '../sql/sql.gyp:sql', 43 '../sql/sql.gyp:sql',
45 '../sync/sync.gyp:sync', 44 '../sync/sync.gyp:sync',
46 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 45 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
47 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', 46 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp',
48 '../third_party/icu/icu.gyp:icui18n', 47 '../third_party/icu/icu.gyp:icui18n',
49 '../third_party/icu/icu.gyp:icuuc', 48 '../third_party/icu/icu.gyp:icuuc',
50 '../third_party/libjingle/libjingle.gyp:libjingle', 49 '../third_party/libjingle/libjingle.gyp:libjingle',
51 '../third_party/libxml/libxml.gyp:libxml', 50 '../third_party/libxml/libxml.gyp:libxml',
52 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 51 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
52 '../third_party/zlib/zlib.gyp:minizip',
53 '../third_party/zlib/zlib.gyp:zip', 53 '../third_party/zlib/zlib.gyp:zip',
54 '../third_party/zlib/zlib.gyp:minizip',
55 '../third_party/zlib/zlib.gyp:zlib', 54 '../third_party/zlib/zlib.gyp:zlib',
56 '../ui/base/strings/ui_strings.gyp:ui_strings', 55 '../ui/base/strings/ui_strings.gyp:ui_strings',
57 '../ui/message_center/message_center.gyp:message_center', 56 '../ui/message_center/message_center.gyp:message_center',
58 '../ui/ui.gyp:shell_dialogs', 57 '../ui/ui.gyp:shell_dialogs',
59 '../ui/ui.gyp:ui', 58 '../ui/ui.gyp:ui',
60 '../ui/ui.gyp:ui_resources', 59 '../ui/ui.gyp:ui_resources',
60 '../url/url.gyp:url',
61 '../webkit/support/webkit_support.gyp:user_agent', 61 '../webkit/support/webkit_support.gyp:user_agent',
62 ], 62 ],
63 'include_dirs': [ 63 'include_dirs': [
64 '..', 64 '..',
65 '<(INTERMEDIATE_DIR)', 65 '<(INTERMEDIATE_DIR)',
66 # Needed by chrome_content_renderer_client.cc. & 66 # Needed by chrome_content_renderer_client.cc. &
67 # plugin_info_message_filter.cc. 67 # plugin_info_message_filter.cc.
68 '<(SHARED_INTERMEDIATE_DIR)', 68 '<(SHARED_INTERMEDIATE_DIR)',
69 ], 69 ],
70 'export_dependent_settings': [ 70 'export_dependent_settings': [
(...skipping 3140 matching lines...) Expand 10 before | Expand all | Expand 10 after
3211 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3211 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3212 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3212 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3213 }, 3213 },
3214 'includes': [ '../build/android/java_cpp_template.gypi' ], 3214 'includes': [ '../build/android/java_cpp_template.gypi' ],
3215 }, 3215 },
3216 ], 3216 ],
3217 }, 3217 },
3218 ], 3218 ],
3219 ], 3219 ],
3220 } 3220 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698