PPAPI/NaCl: Make NaClIPCAdapter transfer handles more generally

ppapi/ppapi_internal.gyp

Index: ppapi/ppapi_internal.gyp
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp
index d4f14973008da96d73b0beb335b6bd5d2b13b5ec..3e32d7171b4bfbc51793439131ce1ec6eb463884 100644
--- a/ppapi/ppapi_internal.gyp
+++ b/ppapi/ppapi_internal.gyp
@@ -26,6 +26,7 @@
   'includes': [
     'ppapi_sources.gypi',
     'ppapi_host.gypi',
+    'ppapi_ipc.gypi',
     'ppapi_proxy.gypi',
     'ppapi_shared.gypi',
     'ppapi_tests.gypi',
@@ -67,28 +68,150 @@
         }],
       ],
     },
-    {
-      'target_name': 'ppapi_proxy',
-      'type': '<(component)',
-      'variables': {
-        'ppapi_proxy_target': 1,
-      },
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../gpu/gpu.gyp:gles2_implementation',
-        '../gpu/gpu.gyp:gpu_ipc',
-        '../ipc/ipc.gyp:ipc',
-        '../skia/skia.gyp:skia',
-        '../ui/surface/surface.gyp:surface',
-        'ppapi.gyp:ppapi_c',
-        'ppapi_shared',
+  ],
+  'conditions': [
+    ['component=="static_library"', {
+      # In a static build, build ppapi_ipc separately.
+      'targets': [
+        {
+          'target_name': 'ppapi_ipc',
+          'type': 'static_library',
+          'variables': {
+            'ppapi_ipc_target': 1,
+          },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../gpu/gpu.gyp:gpu_ipc',
+            '../ipc/ipc.gyp:ipc',
+            '../skia/skia.gyp:skia',
+            'ppapi.gyp:ppapi_c',
+            'ppapi_shared',
+          ],
+          'all_dependent_settings': {
+            'include_dirs': [
+                '..',
+            ],
+          },
+        },
+        {
+          'target_name': 'ppapi_proxy',
+          'type': 'static_library',
+          'variables': {
+            'ppapi_proxy_target': 1,
+          },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../gpu/gpu.gyp:gles2_implementation',
+            '../gpu/gpu.gyp:gpu_ipc',
+            '../ipc/ipc.gyp:ipc',
+            '../skia/skia.gyp:skia',
+            '../ui/surface/surface.gyp:surface',
+            'ppapi.gyp:ppapi_c',
+            'ppapi_shared',
+            'ppapi_ipc',
+          ],
+          'all_dependent_settings': {
+            'include_dirs': [
+                '..',
+            ],
+          },
+        },
       ],
-      'all_dependent_settings': {
-        'include_dirs': [
-           '..',
-        ],
-      },
     },
-  ]
+    { # component != static_library
+      # In the component build, we'll just build ppapi_ipc in to ppapi_proxy.

[brettw, 2012/08/22 23:27:06]

I'm confused about what's happening here (both here and in the old version).
Presumably since you're tweaking it, you figured it out. How does this pull in
the sources from ppapi_proxy.gypi? I have some idea it involves the
ppapi_proxy_target thingy, but I don't see how that works. Can you add a comment
somewhere?

[dmichael (off chromium), 2012/08/23 22:55:14]

I sprinkled in a few comments...  one at the first target in the file, and a
couple in this section, since it's a little special here (pulling sources from 2
gypi files in to 1 target). Please let me know if some more explanation is
needed.

+      'targets': [
+        {
+          'target_name': 'ppapi_proxy',
+          'type': 'shared_library',
+          'variables': {
+            'ppapi_ipc_target': 1,
+            'ppapi_proxy_target': 1,
+          },
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+            '../gpu/gpu.gyp:gles2_implementation',
+            '../gpu/gpu.gyp:gpu_ipc',
+            '../ipc/ipc.gyp:ipc',
+            '../skia/skia.gyp:skia',
+            '../ui/surface/surface.gyp:surface',
+            'ppapi.gyp:ppapi_c',
+            'ppapi_shared',
+          ],
+          'all_dependent_settings': {
+            'include_dirs': [
+                '..',
+            ],
+          },
+        },
+        {
+          'target_name': 'ppapi_ipc',
+          'type': 'none',
+          'dependencies': [
+            'ppapi_proxy',
+          ],
+        },
+      ],
+    }],
+    ['disable_nacl!=1' and 'OS=="win"', {
+      'targets': [
+        {
+          'target_name': 'ppapi_shared_win64',
+          'type': '<(component)',
+          'variables': {
+            'nacl_win64_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_ipc_win64',
+          'type': 'static_library',
+          'variables': {
+            'nacl_win64_target': 1,
+            'ppapi_ipc_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',
+          ],
+          'export_dependent_settings': [
+            '../gpu/gpu.gyp:gpu_ipc_win64',
+          ],
+          'defines': [
+            '<@(nacl_win64_defines)',
+          ],              
+          'all_dependent_settings': {
+            'include_dirs': [
+               '..',
+            ],
+          },
+          'configurations': {
+            'Common_Base': {
+              'msvs_target_platform': 'x64',
+            },
+          },
+      }],
+    }],
+  ],
 }