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

Side by Side Diff: remoting/remoting.gyp

Issue 8635015: Refactor use of ppapi_cpp and ppapi_tests to avoid include of untrusted.gypi (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/ppapi_tests.gypi ('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 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 # Use consistent strings across all platforms. Note that the plugin name 10 # Use consistent strings across all platforms. Note that the plugin name
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 'type': 'static_library', 204 'type': 'static_library',
205 'variables': { 'enable_wexit_time_destructors': 1, }, 205 'variables': { 'enable_wexit_time_destructors': 1, },
206 'defines': [ 206 'defines': [
207 'HAVE_STDINT_H', # Required by on2_integer.h 207 'HAVE_STDINT_H', # Required by on2_integer.h
208 ], 208 ],
209 'dependencies': [ 209 'dependencies': [
210 'remoting_base', 210 'remoting_base',
211 'remoting_client', 211 'remoting_client',
212 'remoting_jingle_glue', 212 'remoting_jingle_glue',
213 '../media/media.gyp:media', 213 '../media/media.gyp:media',
214 '../ppapi/ppapi.gyp:ppapi_cpp_objects', 214 '../ppapi/ppapi_cpp.gyp:ppapi_cpp_objects',
215 215
216 # TODO(sergeyu): This is a hack: plugin should not depend on 216 # TODO(sergeyu): This is a hack: plugin should not depend on
217 # webkit glue. Skia is needed here to add include path webkit glue 217 # webkit glue. Skia is needed here to add include path webkit glue
218 # depends on. See comments in chromoting_instance.cc for details. 218 # depends on. See comments in chromoting_instance.cc for details.
219 # crbug.com/74951 219 # crbug.com/74951
220 '<(DEPTH)/webkit/support/webkit_support.gyp:glue', 220 '<(DEPTH)/webkit/support/webkit_support.gyp:glue',
221 '<(DEPTH)/skia/skia.gyp:skia', 221 '<(DEPTH)/skia/skia.gyp:skia',
222 ], 222 ],
223 'sources': [ 223 'sources': [
224 'client/plugin/chromoting_instance.cc', 224 'client/plugin/chromoting_instance.cc',
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 '../base/allocator/allocator.gyp:allocator', 931 '../base/allocator/allocator.gyp:allocator',
932 ], 932 ],
933 }, 933 },
934 ], 934 ],
935 ], 935 ],
936 }], 936 }],
937 ], # end of 'conditions' 937 ], # end of 'conditions'
938 }, # end of target 'remoting_unittests' 938 }, # end of target 'remoting_unittests'
939 ], # end of targets 939 ], # end of targets
940 } 940 }
OLDNEW
« no previous file with comments | « ppapi/ppapi_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698