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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 19784010: cut a bunch of dependencies from browser->blink when in chrome_multiple_dll (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 5 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 | « content/content_common.gypi ('k') | webkit/storage_browser.gyp » ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 ], 123 ],
124 'dependencies': [ 124 'dependencies': [
125 '<(DEPTH)/base/base.gyp:base_i18n', 125 '<(DEPTH)/base/base.gyp:base_i18n',
126 '<(DEPTH)/base/base.gyp:base_static', 126 '<(DEPTH)/base/base.gyp:base_static',
127 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 127 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
128 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 128 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
129 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 129 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
130 '<(DEPTH)/net/net.gyp:net', 130 '<(DEPTH)/net/net.gyp:net',
131 '<(DEPTH)/printing/printing.gyp:printing', 131 '<(DEPTH)/printing/printing.gyp:printing',
132 '<(DEPTH)/skia/skia.gyp:skia', 132 '<(DEPTH)/skia/skia.gyp:skia',
133 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
134 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 133 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
135 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 134 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
136 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 135 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
137 '<(DEPTH)/ui/gl/gl.gyp:gl', 136 '<(DEPTH)/ui/gl/gl.gyp:gl',
138 '<(DEPTH)/ui/ui.gyp:ui', 137 '<(DEPTH)/ui/ui.gyp:ui',
139 '<(DEPTH)/ui/ui.gyp:ui_resources', 138 '<(DEPTH)/ui/ui.gyp:ui_resources',
140 '<(DEPTH)/url/url.gyp:url_lib', 139 '<(DEPTH)/url/url.gyp:url_lib',
141 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 140 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
142 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent', 141 '<(DEPTH)/webkit/common/user_agent/webkit_user_agent.gyp:user_agent',
143 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common', 142 '<(DEPTH)/webkit/common/webkit_common.gyp:webkit_common',
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 'dependencies': [ 191 'dependencies': [
193 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 192 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
194 ], 193 ],
195 'export_dependent_settings': [ 194 'export_dependent_settings': [
196 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink', 195 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
197 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 196 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
198 ], 197 ],
199 }], 198 }],
200 ], 199 ],
201 }], 200 }],
201 ['chrome_multiple_dll!=1', {
202 'dependencies': [
203 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
204 ],
205 }],
202 ], 206 ],
203 }, 207 },
204 ], 208 ],
205 'conditions': [ 209 'conditions': [
206 ['use_third_party_translations==1', { 210 ['use_third_party_translations==1', {
207 'targets': [ 211 'targets': [
208 { 212 {
209 'target_name': 'inspector_strings', 213 'target_name': 'inspector_strings',
210 'type': 'none', 214 'type': 'none',
211 'variables': { 215 'variables': {
(...skipping 20 matching lines...) Expand all
232 'variables': { 236 'variables': {
233 'jni_gen_package': 'webkit', 237 'jni_gen_package': 'webkit',
234 'input_java_class': 'android/widget/OverScroller.class', 238 'input_java_class': 'android/widget/OverScroller.class',
235 }, 239 },
236 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 240 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
237 }, 241 },
238 ], 242 ],
239 }], 243 }],
240 ], 244 ],
241 } 245 }
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | webkit/storage_browser.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698