Bundle the network service in the shell on 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 57 matching lines @@
         'mojo_html_viewer',
         'mojo_js',
         'mojo_js_bindings',
         'mojo_js_unittests',
         'mojo_launcher',
         'mojo_message_generator',
         'mojo_native_viewport_service',
         'mojo_network_service',
         'mojo_pepper_container_app',
         'mojo_png_viewer',
-        'mojo_profile_service',
         'mojo_public_application_unittests',
         'mojo_public_test_utils',
         'mojo_public_bindings_unittests',
         'mojo_public_environment_unittests',
         'mojo_public_system_perftests',
         'mojo_public_system_unittests',
         'mojo_public_utility_unittests',
         'mojo_sample_app',
         'mojo_service_manager',
         'mojo_service_manager_unittests',
@@ skipping 449 matching lines @@
         '../base/base.gyp:base_static',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_application',
         'mojo_common_lib',
         'mojo_external_service_bindings',
         'mojo_gles2_impl',
         'mojo_native_viewport_service',
         'mojo_network_bindings',
-        'mojo_profile_service',
         'mojo_service_manager',
         'mojo_service_provider_bindings',
         'mojo_spy',
         'mojo_system_impl',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/app_child_process.cc',
         'shell/app_child_process.h',
         'shell/app_child_process.mojom',
@@ skipping 13 matching lines @@
         'shell/init.cc',
         'shell/init.h',
         'shell/in_process_dynamic_service_runner.cc',
         'shell/in_process_dynamic_service_runner.h',
         'shell/keep_alive.cc',
         'shell/keep_alive.h',
         'shell/mojo_url_resolver.cc',
         'shell/mojo_url_resolver.h',
         'shell/out_of_process_dynamic_service_runner.cc',
         'shell/out_of_process_dynamic_service_runner.h',
-        'shell/profile_service_loader.cc',
-        'shell/profile_service_loader.h',
         'shell/run.cc',
         'shell/run.h',
         'shell/switches.cc',
         'shell/switches.h',
         'shell/task_runners.cc',
         'shell/task_runners.h',
         'shell/test_child_process.cc',
         'shell/test_child_process.h',
         'shell/view_manager_loader.cc',
         'shell/view_manager_loader.h',
       ],
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
           ],
         }],
+        ['OS=="android"', {
+          'dependencies': [
+            'mojo_network_service_lib',
+          ],
+          'sources': [
+            'shell/network_service_loader.cc',
+            'shell/network_service_loader.h',
+          ],
+        }],
         ['use_aura==1', {
           'dependencies': [
             # These are only necessary as long as we hard code use of ViewManager.
             '../skia/skia.gyp:skia',
             'mojo_gles2',
             'mojo_view_manager',
             'mojo_view_manager_bindings',
           ],
         }, {  # use_aura==0
           'sources!': [
@@ skipping 308 matching lines @@
             '../base/base.gyp:base_java',
             '../net/net.gyp:net_java',
             'mojo_native_viewport_java',
             'libmojo_shell',
           ],
           'variables': {
             'apk_name': 'MojoShell',
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
-            'additional_bundled_libs': [
-              '<(PRODUCT_DIR)/libmojo_network_service.so',
-            ],
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
     ['OS=="linux"', {
       'targets': [
         {
           'target_name': 'mojo_dbus_service',
           'type': 'static_library',
@@ skipping 105 matching lines @@
             'views/views_init_internal.h',
           ],
           'defines': [
             'MOJO_VIEWS_IMPLEMENTATION',
           ],
         },
       ],
     }],
   ],
 }