Merge libchrome_staging target into browser.

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("//testing/test.gni")
 import("//third_party/icu/config.gni")
@@ skipping 648 matching lines @@
     "//sync:sync_java_test_support",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
   ]
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:staging_jni_headers
-generate_jni("staging_jni_headers") {
-  jni_package = "staging/android"
-  gypi_values = exec_script("//build/gypi_to_gn.py",
-                            [
-                              rebase_path("chrome_apk.gyp"),
-                              "--replace=<(chrome_java_dir)=java_staging",
-                            ],
-                            "scope",
-                            [ "chrome_apk.gyp" ])
-  sources = gypi_values.chrome_staging_jni_files
-}
-
-# GYP: //chrome/android/chrome_apk.gyp:libchrome_staging
-static_library("chrome_staging") {
-  deps = [
-    ":staging_jni_headers",
-    "//chrome/browser",
-    "//chrome:strings",
-    "//components/enhanced_bookmarks",
-    "//components/metrics/proto",
-    "//third_party/leveldatabase",
-  ]
-
-  gypi_values = exec_script(
-          "//build/gypi_to_gn.py",
-          [
-            rebase_path("chrome_apk.gyp"),
-            "--replace=<(chrome_native_sources_dir)=../browser/android/",
-          ],
-          "scope",
-          [ "chrome_apk.gyp" ])
-  sources = gypi_values.chrome_staging_native_sources
-
-  if (safe_browsing_mode != 0) {
-    sources += [
-      "../browser/android/spdy_proxy_resource_throttle.cc",
-      "../browser/android/spdy_proxy_resource_throttle.h",
-    ]
-  }
-
-  libs = [
-    "android",
-    "jnigraphics",
-  ]
-
-  defines = []
+# TODO(newt): delete this once all references are gone.
+group("chrome_staging") {
 }
 
 chrome_public_apk_assets_dir = "$root_build_dir/chrome_public_apk_assets"
 
 chrome_android_paks_gypi =
     exec_script("//build/gypi_to_gn.py",
                 [ rebase_path("//chrome/chrome_android_paks.gypi") ],
                 "scope",
                 [ "//chrome/chrome_android_paks.gypi" ])
 
@@ skipping 40 matching lines @@
     "java/res_template/xml/searchable.xml",
     "java/res_template/xml/syncadapter.xml",
   ]
   res_dir = "java/res_template"
   variables = jinja_variables
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:libchrome_public
 shared_library("chrome_public") {
   deps = [
-    "//chrome/android:chrome_staging",
     "//chrome:chrome_android_core",
   ]
   gypi_values = exec_script(
           "//build/gypi_to_gn.py",
           [
             rebase_path("chrome_apk.gyp"),
             "--replace=<(chrome_native_sources_dir)=../browser/android/",
           ],
           "scope",
           [ "chrome_apk.gyp" ])
@@ skipping 45 matching lines @@
   apk_name = "ChromePublicTest"
   apk_under_test = ":chrome_public_apk"
   android_manifest = chrome_public_test_apk_manifest
   deps = [
     ":chrome_public_test_apk_manifest",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//chrome/android:chrome_staging_test_java",
   ]
   isolate_file = "../chrome_public_test_apk.isolate"
 }