Fix gpu_ipc_service_unittests on Android

gpu/gpu.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'nacl_win64_target': 0,
     'build_angle_deqp_tests%': 0,
   },
   'includes': [
@@ skipping 319 matching lines @@
         'ipc/service/gpu_channel_manager_unittest.cc',
         'ipc/service/gpu_channel_test_common.cc',
         'ipc/service/gpu_channel_test_common.h',
         'ipc/service/gpu_channel_unittest.cc',
       ],
       'include_dirs': [
         '../third_party/mesa/src/include',
       ],
       'conditions': [
         ['OS == "android"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
           'sources': [
             'ipc/service/gpu_memory_buffer_factory_surface_texture_unittest.cc',
           ],
         }],
         ['OS == "mac"', {
           'sources': [
             'ipc/service/gpu_memory_buffer_factory_io_surface_unittest.cc',
           ],
         }],
         ['use_ozone == 1', {
@@ skipping 137 matching lines @@
         'command_buffer/client/gles2_interface_stub.h',
         'command_buffer/service/error_state_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],
     },
     {
       # GN version: //gpu/ipc/service:test_support
       'target_name': 'gpu_ipc_service_test_support',
       'type': 'static_library',
       'dependencies': [
+        # TODO(markdittmer): Shouldn't depend on client code for server tests.
+        # See crbug.com/608800.
+        'gpu_ipc_client',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'gpu/ipc/service/gpu_memory_buffer_factory_test_template.h',
       ],
     },
     {
       # GN version: //gpu:command_buffer_gles2
@@ skipping 641 matching lines @@
             ],
             'sources': [
               'gpu_unittests_apk.isolate',
             ],
           },
         ],
       },
     ],
   ],
 }