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

Side by Side Diff: content/content_plugin.gypi

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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
« no previous file with comments | « content/content_gpu.gypi ('k') | content/content_ppapi_plugin.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) 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 'conditions': [ 6 'conditions': [
7 ['enable_plugins==1 and OS!="linux"', { 7 ['enable_plugins==1 and OS!="linux"', {
8 'dependencies': [ 8 'dependencies': [
9 '../mojo/public/mojo_public.gyp:mojo_application_bindings',
10 '../skia/skia.gyp:skia', 9 '../skia/skia.gyp:skia',
11 '../third_party/WebKit/public/blink.gyp:blink', 10 '../third_party/WebKit/public/blink.gyp:blink',
12 '../third_party/npapi/npapi.gyp:npapi', 11 '../third_party/npapi/npapi.gyp:npapi',
13 ], 12 ],
14 'include_dirs': [ 13 'include_dirs': [
15 '<(INTERMEDIATE_DIR)', 14 '<(INTERMEDIATE_DIR)',
16 ], 15 ],
17 'sources': [ 16 'sources': [
18 # All .cc, .h, .m, and .mm files under plugins except for tests and 17 # All .cc, .h, .m, and .mm files under plugins except for tests and
19 # mocks. 18 # mocks.
(...skipping 18 matching lines...) Expand all
38 'conditions': [ 37 'conditions': [
39 ['OS=="win"', { 38 ['OS=="win"', {
40 'include_dirs': [ 39 'include_dirs': [
41 '<(DEPTH)/third_party/wtl/include', 40 '<(DEPTH)/third_party/wtl/include',
42 ], 41 ],
43 }], 42 }],
44 ], 43 ],
45 }], 44 }],
46 ], 45 ],
47 } 46 }
OLDNEW
« no previous file with comments | « content/content_gpu.gypi ('k') | content/content_ppapi_plugin.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698