Remove GYP for mojo/shell and mojo/services

mojo/mojo_base.gyp

Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 03614dfaea1dd28aead967a5ba152e17e1833fee..47edd6996c9154f9f0f0a9748efd729668b0100b 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -26,9 +26,6 @@
       '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',
           ],
@@ -220,34 +217,11 @@
             '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' ],
+          'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libmojo_system_java',
@@ -266,52 +240,28 @@
           ],
         },
         {
-          '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' ],
         },
       ]
-    }],
+    }]
   ]
 }