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

Side by Side Diff: webkit/glue/webkit_glue.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/common/user_agent/webkit_user_agent.gyp ('k') | webkit/plugins/webkit_plugins.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 # 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 'target_defaults': { 6 'target_defaults': {
7 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
8 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
9 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
10 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 { 58 {
59 'target_name': 'glue_common', 59 'target_name': 'glue_common',
60 'type': '<(component)', 60 'type': '<(component)',
61 'variables': { 'enable_wexit_time_destructors': 1, }, 61 'variables': { 'enable_wexit_time_destructors': 1, },
62 'defines': [ 62 'defines': [
63 'WEBKIT_EXTENSIONS_IMPLEMENTATION', 63 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
64 'WEBKIT_GLUE_IMPLEMENTATION', 64 'WEBKIT_GLUE_IMPLEMENTATION',
65 ], 65 ],
66 'dependencies': [ 66 'dependencies': [
67 '<(DEPTH)/base/base.gyp:base',
67 '<(DEPTH)/base/base.gyp:base_i18n', 68 '<(DEPTH)/base/base.gyp:base_i18n',
68 '<(DEPTH)/base/base.gyp:base',
69 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 69 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
70 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
71 '<(DEPTH)/net/net.gyp:net', 70 '<(DEPTH)/net/net.gyp:net',
72 '<(DEPTH)/skia/skia.gyp:skia', 71 '<(DEPTH)/skia/skia.gyp:skia',
73 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 72 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
74 '<(DEPTH)/ui/ui.gyp:ui', 73 '<(DEPTH)/ui/ui.gyp:ui',
75 '<(DEPTH)/ui/ui.gyp:ui_resources', 74 '<(DEPTH)/ui/ui.gyp:ui_resources',
75 '<(DEPTH)/url/url.gyp:url_lib',
76 ], 76 ],
77 77
78 'include_dirs': [ 78 'include_dirs': [
79 '<(INTERMEDIATE_DIR)', 79 '<(INTERMEDIATE_DIR)',
80 '<(SHARED_INTERMEDIATE_DIR)/webkit', 80 '<(SHARED_INTERMEDIATE_DIR)/webkit',
81 '<(SHARED_INTERMEDIATE_DIR)/ui', 81 '<(SHARED_INTERMEDIATE_DIR)/ui',
82 ], 82 ],
83 83
84 'sources': [ 84 'sources': [
85 'multipart_response_delegate.cc', 85 'multipart_response_delegate.cc',
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 'type': '<(component)', 159 'type': '<(component)',
160 'variables': { 'enable_wexit_time_destructors': 1, }, 160 'variables': { 'enable_wexit_time_destructors': 1, },
161 'defines': [ 161 'defines': [
162 'WEBKIT_EXTENSIONS_IMPLEMENTATION', 162 'WEBKIT_EXTENSIONS_IMPLEMENTATION',
163 'WEBKIT_GLUE_IMPLEMENTATION', 163 'WEBKIT_GLUE_IMPLEMENTATION',
164 ], 164 ],
165 'dependencies': [ 165 'dependencies': [
166 '<(DEPTH)/base/base.gyp:base_i18n', 166 '<(DEPTH)/base/base.gyp:base_i18n',
167 '<(DEPTH)/base/base.gyp:base_static', 167 '<(DEPTH)/base/base.gyp:base_static',
168 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 168 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
169 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
170 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 169 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
171 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 170 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
172 '<(DEPTH)/net/net.gyp:net', 171 '<(DEPTH)/net/net.gyp:net',
173 '<(DEPTH)/printing/printing.gyp:printing', 172 '<(DEPTH)/printing/printing.gyp:printing',
174 '<(DEPTH)/skia/skia.gyp:skia', 173 '<(DEPTH)/skia/skia.gyp:skia',
175 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 174 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
176 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 175 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
177 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 176 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
178 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 177 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
179 '<(DEPTH)/ui/gl/gl.gyp:gl', 178 '<(DEPTH)/ui/gl/gl.gyp:gl',
180 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', 179 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
181 '<(DEPTH)/ui/ui.gyp:ui', 180 '<(DEPTH)/ui/ui.gyp:ui',
182 '<(DEPTH)/ui/ui.gyp:ui_resources', 181 '<(DEPTH)/ui/ui.gyp:ui_resources',
182 '<(DEPTH)/url/url.gyp:url_lib',
183 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 183 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
184 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support', 184 '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:we bkit_compositor_support',
185 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 185 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
186 'glue_common', 186 'glue_common',
187 'plugins_common', 187 'plugins_common',
188 'plugins', 188 'plugins',
189 'webkit_base', 189 'webkit_base',
190 'webkit_common', 190 'webkit_common',
191 'webkit_media', 191 'webkit_media',
192 'webkit_resources', 192 'webkit_resources',
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 'variables': { 368 'variables': {
369 'jni_gen_package': 'webkit', 369 'jni_gen_package': 'webkit',
370 'input_java_class': 'android/widget/OverScroller.class', 370 'input_java_class': 'android/widget/OverScroller.class',
371 }, 371 },
372 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 372 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
373 }, 373 },
374 ], 374 ],
375 }], 375 }],
376 ], 376 ],
377 } 377 }
OLDNEW
« no previous file with comments | « webkit/common/user_agent/webkit_user_agent.gyp ('k') | webkit/plugins/webkit_plugins.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698