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

Unified Diff: ppapi/ppapi.gyp

Issue 7320002: Allow C/C++ targets to be suffixed for use in Native Client checkout. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ppapi/ppapi_cpp.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/ppapi.gyp
===================================================================
--- ppapi/ppapi.gyp (revision 91704)
+++ ppapi/ppapi.gyp (working copy)
@@ -9,6 +9,17 @@
{
'variables': {
'chromium_code': 1, # Use higher warning level.
+
+ # NaCl also uses the C and C++ PPAPI targets. We want it to be able to use
+ # its own version of PPAPI when compiling into Chrome, which means we'll
+ # actually have two instances of each library in the checkout (though not
+ # compiled into the same binary since NaCl is a shared library).
+ #
+ # This value is the suffix that will be appended to the relevant projects.
+ # In Chrome, it's empty so the projects have the same name. NaCl sets this
+ # to "_nacl" and includes the .gypi files below, giving it different names
+ # for these projects.
+ 'nacl_ppapi_library_suffix': '',
},
'target_defaults': {
'conditions': [
« no previous file with comments | « no previous file | ppapi/ppapi_cpp.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698