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

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

Issue 11103031: webkit: Merge blob and fileapi into one build target 'storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Leave *.gypi files in blob and fileapi Created 8 years, 2 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/fileapi/webkit_fileapi.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) 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 '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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 '<(DEPTH)/printing/printing.gyp:printing', 87 '<(DEPTH)/printing/printing.gyp:printing',
88 '<(DEPTH)/skia/skia.gyp:skia', 88 '<(DEPTH)/skia/skia.gyp:skia',
89 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 89 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
90 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 90 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
91 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 91 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
92 '<(DEPTH)/ui/gl/gl.gyp:gl', 92 '<(DEPTH)/ui/gl/gl.gyp:gl',
93 '<(DEPTH)/ui/ui.gyp:ui', 93 '<(DEPTH)/ui/ui.gyp:ui',
94 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 94 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
95 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support', 95 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support',
96 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 96 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
97 'blob',
98 'fileapi',
99 'user_agent', 97 'user_agent',
100 'webkit_base', 98 'webkit_base',
101 'webkit_media', 99 'webkit_media',
102 'webkit_resources', 100 'webkit_resources',
101 'webkit_storage',
103 'webkit_strings', 102 'webkit_strings',
104 ], 103 ],
105 'include_dirs': [ 104 'include_dirs': [
106 '<(INTERMEDIATE_DIR)', 105 '<(INTERMEDIATE_DIR)',
107 '<(SHARED_INTERMEDIATE_DIR)/webkit', 106 '<(SHARED_INTERMEDIATE_DIR)/webkit',
108 ], 107 ],
109 'sources': [ 108 'sources': [
110 # This list contains all .h, .cc, and .mm files in glue except for 109 # This list contains all .h, .cc, and .mm files in glue except for
111 # those in the test subdirectory and those with unittest in in their 110 # those in the test subdirectory and those with unittest in in their
112 # names. 111 # names.
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 }, 491 },
493 'includes': [ '../../build/grit_action.gypi' ], 492 'includes': [ '../../build/grit_action.gypi' ],
494 }, 493 },
495 ], 494 ],
496 'includes': [ '../../build/grit_target.gypi' ], 495 'includes': [ '../../build/grit_target.gypi' ],
497 }, 496 },
498 ], 497 ],
499 }], 498 }],
500 ], 499 ],
501 } 500 }
OLDNEW
« no previous file with comments | « webkit/fileapi/webkit_fileapi.gypi ('k') | webkit/storage/webkit_storage.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698