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

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: Rename 'storage' to 'webkit_storage' 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
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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 '<(DEPTH)/printing/printing.gyp:printing', 89 '<(DEPTH)/printing/printing.gyp:printing',
90 '<(DEPTH)/skia/skia.gyp:skia', 90 '<(DEPTH)/skia/skia.gyp:skia',
91 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 91 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
92 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 92 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
93 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 93 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
94 '<(DEPTH)/ui/gl/gl.gyp:gl', 94 '<(DEPTH)/ui/gl/gl.gyp:gl',
95 '<(DEPTH)/ui/ui.gyp:ui', 95 '<(DEPTH)/ui/ui.gyp:ui',
96 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 96 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
97 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support', 97 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support',
98 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 98 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
99 'blob',
100 'fileapi',
101 'user_agent', 99 'user_agent',
102 'webkit_base', 100 'webkit_base',
103 'webkit_media', 101 'webkit_media',
104 'webkit_resources', 102 'webkit_resources',
103 'webkit_storage',
105 'webkit_strings', 104 'webkit_strings',
106 ], 105 ],
107 'include_dirs': [ 106 'include_dirs': [
108 '<(INTERMEDIATE_DIR)', 107 '<(INTERMEDIATE_DIR)',
109 '<(SHARED_INTERMEDIATE_DIR)/webkit', 108 '<(SHARED_INTERMEDIATE_DIR)/webkit',
110 ], 109 ],
111 'sources': [ 110 'sources': [
112 # This list contains all .h, .cc, and .mm files in glue except for 111 # This list contains all .h, .cc, and .mm files in glue except for
113 # those in the test subdirectory and those with unittest in in their 112 # those in the test subdirectory and those with unittest in in their
114 # names. 113 # names.
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 }, 498 },
500 'includes': [ '../../build/grit_action.gypi' ], 499 'includes': [ '../../build/grit_action.gypi' ],
501 }, 500 },
502 ], 501 ],
503 'includes': [ '../../build/grit_target.gypi' ], 502 'includes': [ '../../build/grit_target.gypi' ],
504 }, 503 },
505 ], 504 ],
506 }], 505 }],
507 ], 506 ],
508 } 507 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698