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

Side by Side Diff: webkit/plugins/webkit_plugins.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 | « webkit/glue/webkit_glue.gypi ('k') | webkit/storage/webkit_storage.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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': 'plugins_common', 8 'target_name': 'plugins_common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines': [ 10 'defines': [
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 ], 80 ],
81 'include_dirs': [ 81 'include_dirs': [
82 '<(INTERMEDIATE_DIR)', 82 '<(INTERMEDIATE_DIR)',
83 '<(SHARED_INTERMEDIATE_DIR)/webkit', 83 '<(SHARED_INTERMEDIATE_DIR)/webkit',
84 '<(SHARED_INTERMEDIATE_DIR)/ui', 84 '<(SHARED_INTERMEDIATE_DIR)/ui',
85 ], 85 ],
86 'dependencies': [ 86 'dependencies': [
87 '<(DEPTH)/base/base.gyp:base', 87 '<(DEPTH)/base/base.gyp:base',
88 '<(DEPTH)/base/base.gyp:base_i18n', 88 '<(DEPTH)/base/base.gyp:base_i18n',
89 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 89 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
90 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
91 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 90 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
92 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 91 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
93 '<(DEPTH)/media/media.gyp:media', 92 '<(DEPTH)/media/media.gyp:media',
94 '<(DEPTH)/media/media.gyp:shared_memory_support', 93 '<(DEPTH)/media/media.gyp:shared_memory_support',
95 '<(DEPTH)/net/net.gyp:net', 94 '<(DEPTH)/net/net.gyp:net',
96 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 95 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
97 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 96 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
98 '<(DEPTH)/printing/printing.gyp:printing', 97 '<(DEPTH)/printing/printing.gyp:printing',
99 '<(DEPTH)/skia/skia.gyp:skia', 98 '<(DEPTH)/skia/skia.gyp:skia',
99 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
100 '<(DEPTH)/ui/gl/gl.gyp:gl', 100 '<(DEPTH)/ui/gl/gl.gyp:gl',
101 '<(DEPTH)/ui/ui.gyp:ui', 101 '<(DEPTH)/ui/ui.gyp:ui',
102 '<(DEPTH)/ui/ui.gyp:ui_resources', 102 '<(DEPTH)/ui/ui.gyp:ui_resources',
103 '<(DEPTH)/url/url.gyp:url_lib',
103 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 104 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
104 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 105 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
105 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 106 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
106 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support', 107 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support',
107 'glue_common', 108 'glue_common',
108 'plugins_common', 109 'plugins_common',
109 'webkit_base', 110 'webkit_base',
110 'webkit_common', 111 'webkit_common',
111 'webkit_storage', 112 'webkit_storage',
112 ], 113 ],
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 '<(DEPTH)/third_party/wtl/include', 288 '<(DEPTH)/third_party/wtl/include',
288 ], 289 ],
289 'sources!': [ 290 'sources!': [
290 'plugins/plugin_stubs.cc', 291 'plugins/plugin_stubs.cc',
291 ], 292 ],
292 }], 293 }],
293 ], 294 ],
294 } 295 }
295 ], 296 ],
296 } 297 }
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/storage/webkit_storage.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698