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

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

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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/DEPS ('k') | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc » ('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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 123 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
124 '<(DEPTH)/media/media.gyp:media', 124 '<(DEPTH)/media/media.gyp:media',
125 '<(DEPTH)/net/net.gyp:net', 125 '<(DEPTH)/net/net.gyp:net',
126 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 126 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
127 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 127 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
128 '<(DEPTH)/printing/printing.gyp:printing', 128 '<(DEPTH)/printing/printing.gyp:printing',
129 '<(DEPTH)/skia/skia.gyp:skia', 129 '<(DEPTH)/skia/skia.gyp:skia',
130 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 130 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
131 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 131 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
132 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 132 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
133 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 133 '<(DEPTH)/ui/gl/gl.gyp:gl',
134 '<(DEPTH)/ui/ui.gyp:ui', 134 '<(DEPTH)/ui/ui.gyp:ui',
135 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 135 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
136 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 136 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
137 'fileapi', 137 'fileapi',
138 'webkit_media', 138 'webkit_media',
139 'webkit_resources', 139 'webkit_resources',
140 'webkit_strings', 140 'webkit_strings',
141 'webkit_user_agent', 141 'webkit_user_agent',
142 ], 142 ],
143 'include_dirs': [ 143 'include_dirs': [
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 }, 563 },
564 'includes': [ '../../build/grit_action.gypi' ], 564 'includes': [ '../../build/grit_action.gypi' ],
565 }, 565 },
566 ], 566 ],
567 'includes': [ '../../build/grit_target.gypi' ], 567 'includes': [ '../../build/grit_target.gypi' ],
568 }, 568 },
569 ], 569 ],
570 }], 570 }],
571 ], 571 ],
572 } 572 }
OLDNEW
« no previous file with comments | « webkit/DEPS ('k') | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698