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

Side by Side Diff: chrome/chrome_browser_chromeos.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 | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser_chromeos', 9 'target_name': 'browser_chromeos',
10 'type': 'static_library', 10 'type': 'static_library',
11 'variables': { 11 'variables': {
12 'conditions': [ 12 'conditions': [
13 ['sysroot!=""', { 13 ['sysroot!=""', {
14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)"', 14 'pkg-config': '../build/linux/pkg-config-wrapper "<(sysroot)" "<(tar get_arch)"',
15 }, { 15 }, {
16 'pkg-config': 'pkg-config' 16 'pkg-config': 'pkg-config'
17 }], 17 }],
18 ], 18 ],
19 # Override to dynamically link the cras (ChromeOS audio) library. 19 # Override to dynamically link the cras (ChromeOS audio) library.
20 'use_cras%': 0, 20 'use_cras%': 0,
21 'enable_wexit_time_destructors': 1, 21 'enable_wexit_time_destructors': 1,
22 }, 22 },
23 'dependencies': [ 23 'dependencies': [
24 # TODO(tbarzic): Cleanup this list. 24 # TODO(tbarzic): Cleanup this list.
25 'attestation_proto',
25 'app/policy/cloud_policy_codegen.gyp:policy', 26 'app/policy/cloud_policy_codegen.gyp:policy',
26 » 'attestation_proto', 27 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ',
27 'browser_extensions', 28 'browser_extensions',
28 'browser/performance_monitor/performance_monitor.gyp:performance_monitor ',
29 'cert_logger_proto', 29 'cert_logger_proto',
30 'chrome_resources.gyp:chrome_extra_resources', 30 'chrome_resources.gyp:chrome_extra_resources',
31 'chrome_resources.gyp:chrome_resources', 31 'chrome_resources.gyp:chrome_resources',
32 'chrome_resources.gyp:platform_locale_settings', 32 'chrome_resources.gyp:platform_locale_settings',
33 'chrome_resources.gyp:theme_resources', 33 'chrome_resources.gyp:theme_resources',
34 'common', 34 'common',
35 'common/extensions/api/api.gyp:api', 35 'common/extensions/api/api.gyp:api',
36 'common_net', 36 'common_net',
37 'contacts_proto', 37 'contacts_proto',
38 'debugger', 38 'debugger',
39 'device_policy_proto', 39 'device_policy_proto',
40 'drive_proto', 40 'drive_proto',
41 'feedback_proto', 41 'feedback_proto',
42 'in_memory_url_index_cache_proto', 42 'in_memory_url_index_cache_proto',
43 'installer_util', 43 'installer_util',
44 'safe_browsing_proto', 44 'safe_browsing_proto',
45 'safe_browsing_report_proto', 45 'safe_browsing_report_proto',
46 'variations_seed_proto', 46 'variations_seed_proto',
47 '../build/linux/system.gyp:dbus', 47 '../build/linux/system.gyp:dbus',
48 '../build/temp_gyp/googleurl.gyp:googleurl',
49 '../chromeos/chromeos.gyp:chromeos', 48 '../chromeos/chromeos.gyp:chromeos',
50 '../chromeos/chromeos.gyp:chromeos_memory', 49 '../chromeos/chromeos.gyp:chromeos_memory',
50 '../chromeos/ime/input_method.gyp:gencode',
51 '../content/content.gyp:content_browser', 51 '../content/content.gyp:content_browser',
52 '../content/content.gyp:content_common', 52 '../content/content.gyp:content_common',
53 '../chromeos/ime/input_method.gyp:gencode',
54 '../crypto/crypto.gyp:crypto', 53 '../crypto/crypto.gyp:crypto',
55 '../dbus/dbus.gyp:dbus', 54 '../dbus/dbus.gyp:dbus',
56 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 55 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
57 '../media/media.gyp:media', 56 '../media/media.gyp:media',
58 '../net/net.gyp:net', 57 '../net/net.gyp:net',
59 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin 58 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
60 '../printing/printing.gyp:printing', 59 '../printing/printing.gyp:printing',
61 '../skia/skia.gyp:skia', 60 '../skia/skia.gyp:skia',
62 '../sync/sync.gyp:sync', 61 '../sync/sync.gyp:sync',
63 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h', 62 '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
64 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n', 63 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n',
65 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp', 64 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidatio n_proto_cpp',
66 '../third_party/cld/cld.gyp:cld', 65 '../third_party/cld/cld.gyp:cld',
67 '../third_party/expat/expat.gyp:expat', 66 '../third_party/expat/expat.gyp:expat',
68 '../third_party/hunspell/hunspell.gyp:hunspell', 67 '../third_party/hunspell/hunspell.gyp:hunspell',
69 '../third_party/icu/icu.gyp:icui18n', 68 '../third_party/icu/icu.gyp:icui18n',
70 '../third_party/icu/icu.gyp:icuuc', 69 '../third_party/icu/icu.gyp:icuuc',
71 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', 70 '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
72 '../third_party/libevent/libevent.gyp:libevent', 71 '../third_party/libevent/libevent.gyp:libevent',
73 '../third_party/libjingle/libjingle.gyp:libjingle', 72 '../third_party/libjingle/libjingle.gyp:libjingle',
74 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', 73 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
75 '../third_party/libusb/libusb.gyp:libusb', 74 '../third_party/libusb/libusb.gyp:libusb',
76 '../third_party/libxml/libxml.gyp:libxml', 75 '../third_party/libxml/libxml.gyp:libxml',
77 '../third_party/npapi/npapi.gyp:npapi', 76 '../third_party/npapi/npapi.gyp:npapi',
78 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 77 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
79 '../third_party/protobuf/protobuf.gyp:protoc#host', 78 '../third_party/protobuf/protobuf.gyp:protoc#host',
80 'chrome_resources.gyp:chrome_strings',
81 '../third_party/re2/re2.gyp:re2', 79 '../third_party/re2/re2.gyp:re2',
82 '../third_party/zlib/zlib.gyp:zlib', 80 '../third_party/zlib/zlib.gyp:zlib',
83 '../ui/base/strings/ui_strings.gyp:ui_strings', 81 '../ui/base/strings/ui_strings.gyp:ui_strings',
84 '../ui/surface/surface.gyp:surface', 82 '../ui/surface/surface.gyp:surface',
85 '../ui/ui.gyp:ui', 83 '../ui/ui.gyp:ui',
86 '../ui/ui.gyp:ui_resources', 84 '../ui/ui.gyp:ui_resources',
85 '../ui/views/controls/webview/webview.gyp:webview',
87 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 86 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
87 '../url/url.gyp:url_lib',
88 '../v8/tools/gyp/v8.gyp:v8', 88 '../v8/tools/gyp/v8.gyp:v8',
89 '../ui/views/controls/webview/webview.gyp:webview', 89 '../ui/views/controls/webview/webview.gyp:webview',
90 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 90 '../webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
91 '../webkit/support/webkit_support.gyp:glue', 91 '../webkit/support/webkit_support.gyp:glue',
92 '../webkit/support/webkit_support.gyp:webkit_resources', 92 '../webkit/support/webkit_support.gyp:webkit_resources',
93 '../webkit/support/webkit_support.gyp:webkit_storage', 93 '../webkit/support/webkit_support.gyp:webkit_storage',
94 'chrome_resources.gyp:chrome_strings',
94 ], 95 ],
95 'defines': [ 96 'defines': [
96 '<@(nacl_defines)', 97 '<@(nacl_defines)',
97 ], 98 ],
98 'direct_dependent_settings': { 99 'direct_dependent_settings': {
99 'defines': [ 100 'defines': [
100 '<@(nacl_defines)', 101 '<@(nacl_defines)',
101 ], 102 ],
102 }, 103 },
103 'export_dependent_settings': [ 104 'export_dependent_settings': [
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 'browser/chromeos/attestation/attestation_key_payload.proto', 922 'browser/chromeos/attestation/attestation_key_payload.proto',
922 ], 923 ],
923 'variables': { 924 'variables': {
924 'proto_in_dir': 'browser/chromeos/attestation', 925 'proto_in_dir': 'browser/chromeos/attestation',
925 'proto_out_dir': 'chrome/browser/chromeos/attestation', 926 'proto_out_dir': 'chrome/browser/chromeos/attestation',
926 }, 927 },
927 'includes': [ '../build/protoc.gypi' ] 928 'includes': [ '../build/protoc.gypi' ]
928 }, 929 },
929 ], 930 ],
930 } 931 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698