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

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

Issue 7637002: Make webkit_glue depend on v8 explicitly. This is needed for (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 '<(DEPTH)/base/base.gyp:base_static', 107 '<(DEPTH)/base/base.gyp:base_static',
108 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 108 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
109 '<(DEPTH)/net/net.gyp:net', 109 '<(DEPTH)/net/net.gyp:net',
110 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 110 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
111 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 111 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
112 '<(DEPTH)/printing/printing.gyp:printing', 112 '<(DEPTH)/printing/printing.gyp:printing',
113 '<(DEPTH)/skia/skia.gyp:skia', 113 '<(DEPTH)/skia/skia.gyp:skia',
114 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 114 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
115 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 115 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
116 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 116 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
117 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
117 'webkit_resources', 118 'webkit_resources',
118 'webkit_strings', 119 'webkit_strings',
119 'webkit_user_agent', 120 'webkit_user_agent',
120 ], 121 ],
121 'actions': [ 122 'actions': [
122 ], 123 ],
123 'include_dirs': [ 124 'include_dirs': [
124 '<(INTERMEDIATE_DIR)', 125 '<(INTERMEDIATE_DIR)',
125 '<(SHARED_INTERMEDIATE_DIR)/webkit', 126 '<(SHARED_INTERMEDIATE_DIR)/webkit',
126 ], 127 ],
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 'dependencies': [ 503 'dependencies': [
503 '<(DEPTH)/build/win/system.gyp:cygwin', 504 '<(DEPTH)/build/win/system.gyp:cygwin',
504 ], 505 ],
505 'sources!': [ 506 'sources!': [
506 'plugins/plugin_stubs.cc', 507 'plugins/plugin_stubs.cc',
507 ], 508 ],
508 'conditions': [ 509 'conditions': [
509 ['inside_chromium_build==1 and component=="shared_library"', { 510 ['inside_chromium_build==1 and component=="shared_library"', {
510 'dependencies': [ 511 'dependencies': [
511 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:w ebkit', 512 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:w ebkit',
512 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
513 ], 513 ],
514 'export_dependent_settings': [ 514 'export_dependent_settings': [
515 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp: webkit', 515 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp: webkit',
516 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 516 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
517 ], 517 ],
518 }], 518 }],
519 ], 519 ],
520 }], 520 }],
521 ['inside_chromium_build==0', { 521 ['inside_chromium_build==0', {
522 'dependencies': [ 522 'dependencies': [
(...skipping 26 matching lines...) Expand all
549 }, 549 },
550 'includes': [ '../../build/grit_action.gypi' ], 550 'includes': [ '../../build/grit_action.gypi' ],
551 }, 551 },
552 ], 552 ],
553 'includes': [ '../../build/grit_target.gypi' ], 553 'includes': [ '../../build/grit_target.gypi' ],
554 }, 554 },
555 ], 555 ],
556 }], 556 }],
557 ], 557 ],
558 } 558 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698