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

Unified Diff: ppapi/ppapi_internal.gyp

Issue 10828023: PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ready for review? Created 8 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 side-by-side diff with in-line comments
Download patch
Index: ppapi/ppapi_internal.gyp
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index d4f14973008da96d73b0beb335b6bd5d2b13b5ec..3f3496fd49bd3e5d4ae2c3886ab15059df8e850c 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -23,6 +23,63 @@
}],
],
},
+ 'conditions': [
+ ['disable_nacl!=1' and 'OS=="win"', {
+ 'targets': [
+ {
+ 'target_name': 'ppapi_shared_win64',
+ 'type': '<(component)',
+ 'variables': {
+ 'nacl_target': 1,
+ 'ppapi_shared_target': 1,
+ },
+ 'dependencies': [
+ 'ppapi.gyp:ppapi_c',
+ '../base/base.gyp:base_nacl_win64',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
+ ],
+ 'defines': [
+ '<@(nacl_win64_defines)',
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base_nacl_win64',
+ ],
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_target_platform': 'x64',
+ },
+ },
+ },
+ {
+ 'target_name': 'ppapi_proxy_win64',
+ 'type': '<(component)',
+ 'variables': {
+ 'nacl_target': 1,
+ 'ppapi_proxy_target': 1,
+ },
+ 'dependencies': [
+ '../base/base.gyp:base_nacl_win64',
+ '../ipc/ipc.gyp:ipc_win64',
+ '../gpu/gpu.gyp:gpu_ipc_win64',
+ 'ppapi.gyp:ppapi_c',
+ 'ppapi_shared_win64',
+ ],
+ 'defines': [
+ '<@(nacl_win64_defines)',
+ ],
+ 'all_dependent_settings': {
+ 'include_dirs': [
+ '..',
+ ],
+ },
+ 'configurations': {
+ 'Common_Base': {
+ 'msvs_target_platform': 'x64',
+ },
+ },
+ }],
+ }],
+ ],
'includes': [
'ppapi_sources.gypi',
'ppapi_host.gypi',
@@ -90,5 +147,5 @@
],
},
},
- ]
+ ],
}

Powered by Google App Engine
This is Rietveld 408576698