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

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

Issue 7601002: Revert r95841 due to failing media_unittests on linux_shared bot. (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 | « remoting/remoting.gyp ('k') | 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 # own hard dependencies. 97 # own hard dependencies.
98 'hard_dependency': 1, 98 'hard_dependency': 1,
99 'conditions': [ 99 'conditions': [
100 ], 100 ],
101 }, 101 },
102 { 102 {
103 'target_name': 'glue', 103 'target_name': 'glue',
104 'type': 'static_library', 104 'type': 'static_library',
105 'dependencies': [ 105 'dependencies': [
106 '<(DEPTH)/base/base.gyp:base_i18n', 106 '<(DEPTH)/base/base.gyp:base_i18n',
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)/media/media.gyp:yuv_convert',
110 '<(DEPTH)/net/net.gyp:net', 109 '<(DEPTH)/net/net.gyp:net',
111 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 110 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
112 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 111 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
113 '<(DEPTH)/printing/printing.gyp:printing', 112 '<(DEPTH)/printing/printing.gyp:printing',
114 '<(DEPTH)/skia/skia.gyp:skia', 113 '<(DEPTH)/skia/skia.gyp:skia',
115 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 114 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
116 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 115 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
117 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 116 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
118 'webkit_resources', 117 'webkit_resources',
119 'webkit_strings', 118 'webkit_strings',
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after
548 }, 547 },
549 'includes': [ '../../build/grit_action.gypi' ], 548 'includes': [ '../../build/grit_action.gypi' ],
550 }, 549 },
551 ], 550 ],
552 'includes': [ '../../build/grit_target.gypi' ], 551 'includes': [ '../../build/grit_target.gypi' ],
553 }, 552 },
554 ], 553 ],
555 }], 554 }],
556 ], 555 ],
557 } 556 }
OLDNEW
« no previous file with comments | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698