Index: ppapi/ppapi_internal.gyp |
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp |
index 8eed2eb1403f98e272cace816a4ba2b55c3f70c8..93dc5a0494e0ae5bae9162fa1a0653f45d12f652 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', |
@@ -35,6 +36,9 @@ |
'target_name': 'ppapi_shared', |
'type': '<(component)', |
'variables': { |
+ # Set the ppapi_shared_target variable, so that we will pull in the |
+ # sources from ppapi_shared.gypi (and only from there). We follow the |
+ # same pattern for the other targets defined within this file. |
'ppapi_shared_target': 1, |
}, |
'dependencies': [ |
@@ -68,28 +72,160 @@ |
}], |
], |
}, |
- { |
- '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', |
+ '../media/media.gyp:shared_memory_support', |
+ '../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. |
+ 'targets': [ |
+ { |
+ 'target_name': 'ppapi_proxy', |
+ 'type': 'shared_library', |
+ 'variables': { |
+ # Setting both variables means we pull in the sources from both |
+ # ppapi_ipc.gypi and ppapi_proxy.gypi. |
+ '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', |
+ '../media/media.gyp:shared_memory_support', |
+ '../ipc/ipc.gyp:ipc', |
+ '../skia/skia.gyp:skia', |
+ '../ui/surface/surface.gyp:surface', |
+ 'ppapi.gyp:ppapi_c', |
+ 'ppapi_shared', |
+ ], |
+ 'all_dependent_settings': { |
+ 'include_dirs': [ |
+ '..', |
+ ], |
+ }, |
+ }, |
+ { |
+ # In component build, this is just a phony target that makes sure |
+ # ppapi_proxy is built, since that's where the ipc sources go in the |
+ # component build. |
+ 'target_name': 'ppapi_ipc', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ 'ppapi_proxy', |
+ ], |
+ }, |
+ ], |
+ }], |
+ ['disable_nacl!=1' and 'OS=="win"', { |
+ # In windows builds, we also want to define some targets to build in |
+ # 64-bit mode for use by nacl64.exe (the NaCl helper process for 64-bit |
+ # Windows). |
+ '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', |
+ }, |
+ }, |
+ }], |
+ }], |
+ ], |
} |