GN: Fix Android component build

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("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 
 # GYP: //chrome/chrome.gyp:chrome_java (resources part)
@@ skipping 189 matching lines @@
 
   deps = [
     "//chrome/browser/ui",
     "//chrome:chrome_android_core",
     "//base",
     "//base/allocator",
     "//content/public/app:browser",
     "//skia",
   ]
 
+  ldflags = [ "-Wl,--gc-sections" ]
+
   # TODO(GYP):
   #[ 'order_profiling!=0', {
   #'conditions': [
   #[ 'OS=="android"', {
   #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
   #}],
   #],
   #}],
 }
 
-# TODO(GYP, cjhopman): make chrome_shell_base actually link and then move it to
-# deps. Also, actually compile the main delegates at that point.
 # GYP: //chrome/chrome_shell.gypi:libchromeshell
 shared_library("chrome_shell") {
   testonly = true
   sources = [
     # This file must always be included in the shared_library step to ensure
     # JNI_OnLoad is exported.
-#"//chrome/app/android/chrome_jni_onload.cc",
-#"shell/chrome_main_delegate_chrome_shell_android.cc",
-#"shell/chrome_main_delegate_chrome_shell_android.h",
+    "//chrome/app/android/chrome_jni_onload.cc",
+    "shell/chrome_main_delegate_chrome_shell_android.cc",
+    "shell/chrome_main_delegate_chrome_shell_android.h",
   ]
   deps = [
-#":chrome_shell_base",
-  ]
-  deps = [ ":chrome_java" ]
-  datadeps = [
-    ":chrome_shell_base"
+    ":chrome_shell_base",
   ]
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromesyncshell
 shared_library("chrome_sync_shell") {
   testonly = true
   sources = [
     # This file must always be included in the shared_library step to ensure
     # JNI_OnLoad is exported.
 #"//chrome/app/android/chrome_jni_onload.cc",
@@ skipping 258 matching lines @@
 process_version("chrome_version_java") {
   source = "java/ChromeVersionConstants.java.version"
   output = chrome_version_java_file
 }
 
 zip("chrome_version_srcjar") {
   inputs = [ chrome_version_java_file ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }