Clean up geolocation code now that it's all upstream.

chrome/chrome_shell.gypi

 # 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.
 
 # This GYPI allows independent customization of the chrome shell in a manner
 # similar to content shell (in content_shell.gypi). Notably, this file does
 # NOT contain chrome_android_core, which is independent of the chrome shell
 # and should be separately customized.
 {
   'variables': {
     'package_name': 'chrome_shell_apk',
   },
   'targets': [
     {
       # GN: //chrome/android:chrome_shell_base
       'target_name': 'libchromeshell_base',
-      'type': 'static_library',
+      'type': 'none',
       'dependencies': [
         '../base/base.gyp:base',
         'chrome_android_core',
         'chrome.gyp:browser_ui',
         '../content/content.gyp:content_app_browser',
       ],
-      'sources': [
-        'android/shell/chrome_shell_google_location_settings_helper.cc',
-        'android/shell/chrome_shell_google_location_settings_helper.h',
-      ],
-      'include_dirs': [
-        '../skia/config',
-      ],
       'direct_dependent_settings': {
         'ldflags': [
           # Some android targets still depend on --gc-sections to link.
           # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
           '-Wl,--gc-sections',
         ],
       },
       'conditions': [
         [ 'order_profiling!=0', {
           'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
@@ skipping 156 matching lines @@
       'target_name': 'chrome_sync_shell_apk_java',
       'type': 'none',
       'dependencies': [
         'chrome_sync_shell_apk',
       ],
       'includes': [ '../build/apk_fake_jar.gypi' ],
     },
   ],
 
 }