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

Side by Side Diff: ppapi/ppapi_proxy.gypi

Issue 10332018: Work around linker error of multiple definitions of pp::BlockUntilComplete (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove .cc 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
« no previous file with comments | « ppapi/cpp/completion_callback.cc ('k') | ppapi/ppapi_sources.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) 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'ppapi_proxy', 8 'target_name': 'ppapi_proxy',
9 'type': '<(component)', 9 'type': '<(component)',
10 'dependencies': [ 10 'dependencies': [
(...skipping 15 matching lines...) Expand all
26 'include_dirs': [ 26 'include_dirs': [
27 '..', 27 '..',
28 '../..', # For nacl includes to work. 28 '../..', # For nacl includes to work.
29 ], 29 ],
30 'sources': [ 30 'sources': [
31 # Take some standalong files from the C++ wrapper allowing us to more 31 # Take some standalong files from the C++ wrapper allowing us to more
32 # easily make async callbacks in the proxy. We can't depend on the 32 # easily make async callbacks in the proxy. We can't depend on the
33 # full C++ wrappers at this layer since the C++ wrappers expect 33 # full C++ wrappers at this layer since the C++ wrappers expect
34 # symbols defining the globals for "being a plugin" which we are not. 34 # symbols defining the globals for "being a plugin" which we are not.
35 # These callback files are standalone. 35 # These callback files are standalone.
36 'cpp/completion_callback.cc',
37 'cpp/completion_callback.h', 36 'cpp/completion_callback.h',
38 'utility/completion_callback_factory.h', 37 'utility/completion_callback_factory.h',
39 38
40 'proxy/broker_dispatcher.cc', 39 'proxy/broker_dispatcher.cc',
41 'proxy/broker_dispatcher.h', 40 'proxy/broker_dispatcher.h',
42 'proxy/dispatcher.cc', 41 'proxy/dispatcher.cc',
43 'proxy/dispatcher.h', 42 'proxy/dispatcher.h',
44 'proxy/enter_proxy.h', 43 'proxy/enter_proxy.h',
45 'proxy/host_dispatcher.cc', 44 'proxy/host_dispatcher.cc',
46 'proxy/host_dispatcher.h', 45 'proxy/host_dispatcher.h',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 'proxy/serialized_var.cc', 168 'proxy/serialized_var.cc',
170 'proxy/serialized_var.h', 169 'proxy/serialized_var.h',
171 'proxy/var_serialization_rules.h', 170 'proxy/var_serialization_rules.h',
172 ], 171 ],
173 'defines': [ 172 'defines': [
174 'PPAPI_PROXY_IMPLEMENTATION', 173 'PPAPI_PROXY_IMPLEMENTATION',
175 ], 174 ],
176 }, 175 },
177 ], 176 ],
178 } 177 }
OLDNEW
« no previous file with comments | « ppapi/cpp/completion_callback.cc ('k') | ppapi/ppapi_sources.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698