Small fixes in mojo_shell for android.

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 572 matching lines @@
         'mojo_service_manager',
         'mojo_shell_lib',
         'mojo_system_impl',
       ],
       'sources': [
         'shell/desktop/mojo_main.cc',
       ],
     },
     {
       'target_name': 'mojo_shell_tests',
-      'type': 'executable',
+      'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         # TODO(vtl): We don't currently need this, but I imagine we will soon.
         # '../ui/gl/gl.gyp:gl',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_service_manager',
         'mojo_shell_lib',
         'mojo_system_impl',
         'mojo_test_service_bindings',
       ],
       'sources': [
         'shell/child_process_host_unittest.cc',
         'shell/shell_test_base.cc',
         'shell/shell_test_base.h',
         'shell/shell_test_base_unittest.cc',
         'shell/shell_test_main.cc',
       ],
+      'conditions': [
+        ['OS == "android"', {
+          'dependencies': [
+            '../testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
+      ],
     },
     {
       'target_name': 'mojo_service_manager_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         '../url/url.gyp:url_lib',
         'mojo_common_lib',
         'mojo_cpp_bindings',
@@ skipping 318 matching lines @@
             'views/native_widget_view_manager.cc',
             'views/native_widget_view_manager.h',
             'views/views_init.cc',
             'views/views_init.h',
           ],
         },
       ],
     }],
   ],
 }