| Index: gpu/gpu_ipc_client.gypi | 
| diff --git a/gpu/gpu_ipc_common.gypi b/gpu/gpu_ipc_client.gypi | 
| similarity index 51% | 
| copy from gpu/gpu_ipc_common.gypi | 
| copy to gpu/gpu_ipc_client.gypi | 
| index 9e9ea60cfcdd35c6f3ffb4cd80258960d87903cf..6ca3c0e06835177ddad9d3493621b3f55543a167 100644 | 
| --- a/gpu/gpu_ipc_common.gypi | 
| +++ b/gpu/gpu_ipc_client.gypi | 
| @@ -20,18 +20,14 @@ | 
| '..', | 
| ], | 
| 'sources': [ | 
| -    'ipc/common/gpu_memory_buffer_support.cc', | 
| -    'ipc/common/gpu_memory_buffer_support.h', | 
| -    'ipc/common/gpu_memory_uma_stats.h', | 
| -    'ipc/common/gpu_message_generator.cc', | 
| -    'ipc/common/gpu_message_generator.h', | 
| -    'ipc/common/gpu_messages.h', | 
| -    'ipc/common/gpu_param_traits.cc', | 
| -    'ipc/common/gpu_param_traits.h', | 
| -    'ipc/common/gpu_param_traits_macros.h', | 
| -    'ipc/common/gpu_stream_constants.h', | 
| -    'ipc/common/gpu_surface_lookup.cc', | 
| -    'ipc/common/gpu_surface_lookup.h', | 
| +    'ipc/client/command_buffer_proxy_impl.cc', | 
| +    'ipc/client/command_buffer_proxy_impl.h', | 
| +    'ipc/client/gpu_channel_host.cc', | 
| +    'ipc/client/gpu_channel_host.h', | 
| +    'ipc/client/gpu_memory_buffer_impl.cc', | 
| +    'ipc/client/gpu_memory_buffer_impl.h', | 
| +    'ipc/client/gpu_memory_buffer_impl_shared_memory.cc', | 
| +    'ipc/client/gpu_memory_buffer_impl_shared_memory.h', | 
| ], | 
| 'conditions': [ | 
| # This section applies to gpu_ipc_win64, used by the NaCl Win64 helper | 
| @@ -43,10 +39,28 @@ | 
| '../ipc/ipc.gyp:ipc', | 
| ], | 
| }], | 
| -    ['use_ozone==1', { | 
| +    ['OS == "android"', { | 
| +      'sources+': [ | 
| +        'ipc/client/gpu_memory_buffer_impl_surface_texture.cc', | 
| +        'ipc/client/gpu_memory_buffer_impl_surface_texture.h', | 
| +      ], | 
| +    }], | 
| +    ['OS == "mac"', { | 
| +      'sources+': [ | 
| +        'ipc/client/gpu_memory_buffer_impl_io_surface.cc', | 
| +        'ipc/client/gpu_memory_buffer_impl_io_surface.h', | 
| +      ], | 
| +    }], | 
| +    ['use_ozone == 1', { | 
| +      'sources+': [ | 
| +        'ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc', | 
| +        'ipc/client/gpu_memory_buffer_impl_ozone_native_pixmap.h', | 
| +      ], | 
| 'dependencies': [ | 
| '../ui/ozone/ozone.gyp:ozone_platform', | 
| ], | 
| }], | 
| ], | 
| +  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 
| +  'msvs_disabled_warnings': [4267, ], | 
| } | 
|  |