Remove GYP for mojo/shell and mojo/services

mojo/mojo_base.gyp

 # Copyright 2014 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.
 
 # Essential components (and their tests) that are needed to build
 # Chrome should be here.  Other components that are useful only in
 # Mojo land like mojo_shell should be in mojo.gyp.
 {
   'includes': [
     'mojo_variables.gypi',
   ],
   'targets': [
     {
       'target_name': 'mojo_base',
       'type': 'none',
       'dependencies': [
         # NOTE: If adding a new dependency here, please consider whether it
         # should also be added to the list of Mojo-related dependencies of
         # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
         # target on iOS due to the presence of the js targets, which cause v8
         # to be built.
         'mojo_common_lib',
         'mojo_common_unittests',
         'mojo_message_generator',
       ],
       'conditions': [
         ['OS == "android"', {
           'dependencies': [
-            'libmojo_system_java',
-            'mojo_system_java',
-            'mojo_test_apk',
             'public/mojo_public.gyp:mojo_bindings_java',
             'public/mojo_public.gyp:mojo_public_java',
           ],
         }],
       ]
     },
     {
       'target_name': 'mojo_none',
       'type': 'none',
     },
@@ skipping 171 matching lines @@
           'target_name': 'mojo_jni_headers',
           'type': 'none',
           'dependencies': [
             'mojo_java_set_jni_headers',
           ],
           'sources': [
             'android/javatests/src/org/chromium/mojo/MojoTestCase.java',
             'android/javatests/src/org/chromium/mojo/bindings/ValidationTestUtil.java',
             'android/system/src/org/chromium/mojo/system/impl/CoreImpl.java',
             'services/native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java',
-            'shell/android/apk/src/org/chromium/mojo_shell_apk/MojoMain.java',
           ],
           'variables': {
             'jni_gen_package': 'mojo',
-         },
+          },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
-          'target_name': 'mojo_java_set_jni_headers',
-          'type': 'none',
-          'variables': {
-            'jni_gen_package': 'mojo',
-            'input_java_class': 'java/util/HashSet.class',
-          },
-          'includes': [ '../build/jar_file_jni_generator.gypi' ],
-        },
-        {
-          'target_name': 'mojo_system_java',
-          'type': 'none',
-          'dependencies': [
-            '../base/base.gyp:base_java',
-            'libmojo_system_java',
-            'public/mojo_public.gyp:mojo_public_java',
-          ],
-          'variables': {
-            'java_in_dir': '<(DEPTH)/mojo/android/system',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
           'target_name': 'libmojo_system_java',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             'edk/mojo_edk.gyp:mojo_system_impl',
             'mojo_common_lib',
             'mojo_environment_chromium',
             'mojo_jni_headers',
           ],
           'sources': [
             'android/system/core_impl.cc',
             'android/system/core_impl.h',
           ],
         },
         {
-          'target_name': 'libmojo_java_unittest',
-          'type': 'shared_library',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:test_support_base',
-            'libmojo_system_java',
-            'mojo_jni_headers',
-            'public/mojo_public.gyp:mojo_public_bindings_test_utils',
-          ],
-          'defines': [
-            'UNIT_TEST'  # As exported from testing/gtest.gyp:gtest.
-          ],
-          'sources': [
-            'android/javatests/mojo_test_case.cc',
-            'android/javatests/mojo_test_case.h',
-            'android/javatests/init_library.cc',
-            'android/javatests/validation_test_util.cc',
-            'android/javatests/validation_test_util.h',
-          ],
+          'target_name': 'mojo_java_set_jni_headers',
+          'type': 'none',
+          'variables': {
+            'jni_gen_package': 'mojo',
+            'input_java_class': 'java/util/HashSet.class',
+          },
+          'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
         {
-          'target_name': 'mojo_test_apk',
+          'target_name': 'mojo_system_java',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java_test_support',
-            'public/mojo_public.gyp:mojo_bindings_java',
-            'mojo_system_java',
-            'public/mojo_public.gyp:mojo_public_test_interfaces',
+            '../base/base.gyp:base_java',
+            'libmojo_system_java',
+            'public/mojo_public.gyp:mojo_public_java',
           ],
           'variables': {
-            'apk_name': 'MojoTest',
-            'java_in_dir': '<(DEPTH)/mojo/android/javatests',
-            'resource_dir': '<(DEPTH)/mojo/android/javatests/apk',
-            'native_lib_target': 'libmojo_java_unittest',
-            'is_test_apk': 1,
-            # Given that this apk tests itself, it needs to bring emma with it
-            # when instrumented.
-            'conditions': [
-              ['emma_coverage != 0', {
-                'emma_instrument': 1,
-              }],
-            ],
+            'java_in_dir': '<(DEPTH)/mojo/android/system',
           },
-          'includes': [ '../build/java_apk.gypi' ],
+          'includes': [ '../build/java.gypi' ],
         },
       ]
-    }],
+    }]
   ]
 }