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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 486573002: Move webkit resources over to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rm the build files from webkit/glue/resources Created 6 years, 4 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 (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',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 '../chromeos/ime/input_method.gyp:gencode', 52 '../chromeos/ime/input_method.gyp:gencode',
53 '../components/components.gyp:cloud_policy_proto', 53 '../components/components.gyp:cloud_policy_proto',
54 '../components/components.gyp:onc_component', 54 '../components/components.gyp:onc_component',
55 '../components/components.gyp:pairing', 55 '../components/components.gyp:pairing',
56 '../components/components.gyp:policy', 56 '../components/components.gyp:policy',
57 # This depends directly on the variations target, rather than just 57 # This depends directly on the variations target, rather than just
58 # transitively via the common target because the proto sources need to 58 # transitively via the common target because the proto sources need to
59 # be generated before code in this target can start building. 59 # be generated before code in this target can start building.
60 '../components/components.gyp:variations', 60 '../components/components.gyp:variations',
61 '../components/components_strings.gyp:components_strings', 61 '../components/components_strings.gyp:components_strings',
62 '../content/app/resources/content_resources.gyp:content_resources',
62 '../content/content.gyp:content_browser', 63 '../content/content.gyp:content_browser',
63 '../content/content.gyp:content_common', 64 '../content/content.gyp:content_common',
64 '../crypto/crypto.gyp:crypto', 65 '../crypto/crypto.gyp:crypto',
65 '../dbus/dbus.gyp:dbus', 66 '../dbus/dbus.gyp:dbus',
66 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 67 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
67 '../device/hid/hid.gyp:device_hid', 68 '../device/hid/hid.gyp:device_hid',
68 '../media/media.gyp:media', 69 '../media/media.gyp:media',
69 '../net/net.gyp:net', 70 '../net/net.gyp:net',
70 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin 71 '../ppapi/ppapi_internal.gyp:ppapi_ipc', # For PpapiMsg_LoadPlugin
71 '../skia/skia.gyp:skia', 72 '../skia/skia.gyp:skia',
(...skipping 24 matching lines...) Expand all
96 '../ui/resources/ui_resources.gyp:ui_resources', 97 '../ui/resources/ui_resources.gyp:ui_resources',
97 '../ui/strings/ui_strings.gyp:ui_strings', 98 '../ui/strings/ui_strings.gyp:ui_strings',
98 '../ui/surface/surface.gyp:surface', 99 '../ui/surface/surface.gyp:surface',
99 '../ui/views/controls/webview/webview.gyp:webview', 100 '../ui/views/controls/webview/webview.gyp:webview',
100 '../ui/views/controls/webview/webview.gyp:webview', 101 '../ui/views/controls/webview/webview.gyp:webview',
101 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', 102 '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
102 '../url/url.gyp:url_lib', 103 '../url/url.gyp:url_lib',
103 '../v8/tools/gyp/v8.gyp:v8', 104 '../v8/tools/gyp/v8.gyp:v8',
104 '../webkit/storage_browser.gyp:webkit_storage_browser', 105 '../webkit/storage_browser.gyp:webkit_storage_browser',
105 '../webkit/storage_common.gyp:webkit_storage_common', 106 '../webkit/storage_common.gyp:webkit_storage_common',
106 '../webkit/glue/resources/webkit_resources.gyp:webkit_resources',
107 'chrome_resources.gyp:chrome_strings', 107 'chrome_resources.gyp:chrome_strings',
108 ], 108 ],
109 'defines': [ 109 'defines': [
110 '<@(nacl_defines)', 110 '<@(nacl_defines)',
111 ], 111 ],
112 'direct_dependent_settings': { 112 'direct_dependent_settings': {
113 'defines': [ 113 'defines': [
114 '<@(nacl_defines)', 114 '<@(nacl_defines)',
115 ], 115 ],
116 }, 116 },
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1198 'browser/chromeos/attestation/attestation_signed_data.proto', 1198 'browser/chromeos/attestation/attestation_signed_data.proto',
1199 ], 1199 ],
1200 'variables': { 1200 'variables': {
1201 'proto_in_dir': 'browser/chromeos/attestation', 1201 'proto_in_dir': 'browser/chromeos/attestation',
1202 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1202 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1203 }, 1203 },
1204 'includes': [ '../build/protoc.gypi' ] 1204 'includes': [ '../build/protoc.gypi' ]
1205 }, 1205 },
1206 ], 1206 ],
1207 } 1207 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698