Revert of Add gclient hook to download prebuilt mojo_shell

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index a5da232d2f4a275d8932c97daaae516bc5e2dc9b..6fdddf25cdacff85c72d7b6d8d7ace8713cf5749 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -19,9 +19,6 @@
     'mojo_services.gypi',
     'mojo_variables.gypi',
   ],
-  'variables': {
-    'use_prebuilt_mojo_shell%': 0,
-  },
   'targets': [
     {
       # GN version: //mojo
@@ -216,6 +213,27 @@
       ],
     },
     {
+      # GN version: //mojo/shell
+      'target_name': 'mojo_shell',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'mojo_base.gyp:mojo_common_lib',
+        'mojo_base.gyp:mojo_environment_chromium',
+        'mojo_shell_lib',
+      ],
+      'sources': [
+        'shell/desktop/mojo_main.cc',
+      ],
+      'conditions': [
+        ['component=="shared_library"', {
+          'dependencies': [
+            '../ui/gfx/gfx.gyp:gfx',
+          ],
+        }],
+      ],
+    },
+    {
       # GN version: //mojo/shell:mojo_shell_tests
       'target_name': 'mojo_shell_tests',
       'type': '<(gtest_target_type)',
@@ -400,45 +418,6 @@
     },
   ],
   'conditions': [
-    ['<(use_prebuilt_mojo_shell)==1', {
-      'targets': [
-        {
-          # GN version: //mojo/public/tools:mojo_shell
-          'target_name': 'mojo_shell',
-          'type': 'none',
-          'copies': [{
-            'destination': '<(PRODUCT_DIR)',
-            'files': [
-              'public/tools/prebuilt/mojo_shell',
-            ],
-          }],
-        },
-      ]
-    }, {  # use_prebuilt_mojo_shell != 1
-      'targets': [
-        {
-          # GN version: //mojo/shell
-          'target_name': 'mojo_shell',
-          'type': 'executable',
-          'dependencies': [
-            '../base/base.gyp:base',
-            'mojo_base.gyp:mojo_common_lib',
-            'mojo_base.gyp:mojo_environment_chromium',
-            'mojo_shell_lib',
-          ],
-          'sources': [
-            'shell/desktop/mojo_main.cc',
-          ],
-          'conditions': [
-            ['component=="shared_library"', {
-              'dependencies': [
-                '../ui/gfx/gfx.gyp:gfx',
-              ],
-            }],
-          ],
-        },
-      ],
-    }],
     ['OS=="android"', {
       'targets': [
         {