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

chrome/android/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/module_args/v8.gni")
 import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("channel.gni")
@@ skipping 149 matching lines @@
   sources = [
     "java/ResourceId.template",
   ]
   package_name = "org/chromium/chrome/browser"
   inputs = [
     "../browser/android/resource_id.h",
   ]
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromeshell_base
-static_library("chrome_shell_base") {
-  sources = [
-    "shell/chrome_shell_google_location_settings_helper.cc",
-    "shell/chrome_shell_google_location_settings_helper.h",
-  ]
-
+group("chrome_shell_base") {
   deps = [
     "//chrome/browser/ui",
     "//chrome:chrome_android_core",
     "//base",
     "//base/allocator",
     "//content/public/app:browser",
     "//skia",
   ]
-
-  # Some android targets still depend on --gc-sections to link.
-  # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
-  ldflags = [ "-Wl,--gc-sections" ]
-
   # TODO(GYP):
   #[ 'order_profiling!=0', {
   #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
   #}],
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromeshell
 shared_library("chrome_shell") {
   testonly = true
   sources = [
@@ skipping 310 matching lines @@
   ]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [
     chrome_version_java_file,
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }