Merge java_staging/src into java/src.

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 103 matching lines @@
 }
 
 # GYP: //chrome/chrome.gyp:chrome_java
 android_library("chrome_java") {
   deps = [
     ":chrome_java_resources",
     ":document_tab_model_info_proto_java",
     "//base:base_java",
     "//net/android:net_java",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/dom_distiller/android:dom_distiller_content_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/invalidation:java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/service_tab_launcher:service_tab_launcher_java",
     "//components/precache/android:precache_java",
     "//components/variations/android:variations_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
+    "//media/base/android:media_java",
     "//printing:printing_java",
     "//sync/android:sync_java",
     "//third_party/android_data_chart:android_data_chart_java",
     "//third_party/android_media:android_media_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
+    "//third_party/android_swipe_refresh:android_swipe_refresh_java",
     "//third_party/android_tools:android_gcm_java",
-    "//third_party/android_swipe_refresh:android_swipe_refresh_java",
     "//third_party/android_tools:android_support_v13_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
+    "//third_party/android_tools:android_support_v7_mediarouter_resources",
+    "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//media/base/android:media_java",
     "//media/midi:midi_java",
     "//ui/android:ui_java",
     "//ui/android:ui_java_resources",
     google_play_services_library,
   ]
 
   srcjar_deps = [
     ":chrome_android_java_enums_srcjar",
     ":chrome_version_srcjar",
+    ":custom_tabs_service_aidl",
     ":resource_id_javagen",
     "//chrome:page_info_connection_type_javagen",
     "//chrome:content_setting_javagen",
     "//chrome:content_settings_type_javagen",
     "//components/enhanced_bookmarks:enhanced_bookmarks_java_enums_srcjar",
   ]
 
   DEPRECATED_java_in_dir = "java/src"
 }
 
@@ skipping 88 matching lines @@
   ]
   testonly = true
   resource_dirs = [ "shell/res" ]
   custom_package = "org.chromium.chrome.shell"
 }
 
 # GYP: N/A
 android_library("chrome_shell_java") {
   testonly = true
   deps = [
-    ":chrome_shell_resources",
     ":chrome_java",
     ":chrome_java_resources",
+    ":chrome_shell_resources",
     "//base:base_java",
     "//content/public/android:content_java",
     "//components/dom_distiller/android:dom_distiller_content_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/service_tab_launcher:service_tab_launcher_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//printing:printing_java",
     "//net/android:net_java",
     "//sync/android:sync_java",
     "//third_party/android_tools:android_support_v13_java",
@@ skipping 307 matching lines @@
   ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
   deps = [
     ":chrome_version_java",
   ]
 }
 
 #GYP: //chrome/android/chrome_apk.gyp:custom_tabs_service_aidl
 android_aidl("custom_tabs_service_aidl") {
-  import_include = "java_staging/src/org/chromium/chrome/browser/customtabs"
+  import_include = "java/src/org/chromium/chrome/browser/customtabs"
   interface_file =
-      "java_staging/src/org/chromium/chrome/browser/customtabs/common.aidl"
+      "java/src/org/chromium/chrome/browser/customtabs/common.aidl"
   sources = [
-    "java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl",
-    "java_staging/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl",
+    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionCallback.aidl",
+    "java/src/org/chromium/chrome/browser/customtabs/ICustomTabsConnectionService.aidl",
   ]
 }
 
-# GYP: //chrome/android/chrome_apk.gyp:chrome_staging_java
-android_library("chrome_staging_java") {
-  DEPRECATED_java_in_dir = "java_staging/src"
-
-  deps = [
-    "//base:base_java",
-    "//net/android:net_java",
-    "//chrome/android:chrome_java",
-    "//chrome/android:chrome_java_resources",
-    "//chrome/android:document_tab_model_info_proto_java",
-    "//components/bookmarks/common/android:bookmarks_java",
-    "//components/dom_distiller/android:dom_distiller_content_java",
-    "//components/dom_distiller/android:dom_distiller_core_java",
-    "//components/invalidation:java",
-    "//components/navigation_interception/android:navigation_interception_java",
-    "//components/service_tab_launcher:service_tab_launcher_java",
-    "//components/variations/android:variations_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
-    "//content/public/android:content_java",
-    "//media/base/android:media_java",
-    "//printing:printing_java",
-    "//sync/android:sync_java",
-    "//third_party/android_protobuf:protobuf_nano_javalib",
-    "//third_party/android_tools:android_gcm_java",
-    "//third_party/android_tools:android_support_v13_java",
-    "//third_party/android_tools:android_support_v7_appcompat_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_java",
-    "//third_party/android_tools:android_support_v7_mediarouter_resources",
-    "//third_party/android_tools:android_support_v7_recyclerview_java",
-    "//third_party/cacheinvalidation:cacheinvalidation_javalib",
-    "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
-    "//third_party/jsr-305:jsr_305_javalib",
-    "//ui/android:ui_java",
-    "//ui/android:ui_java_resources",
-    google_play_services_library,
-  ]
-  srcjar_deps = [ ":custom_tabs_service_aidl" ]
+# TODO(newt): delete this once all references are gone.
+group("chrome_staging_java") {
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_staging_test_java
 android_library("chrome_staging_test_java") {
   testonly = true
   DEPRECATED_java_in_dir = "javatests/src"
 
   deps = [
-    "//chrome/android:chrome_staging_java",
     "//chrome/test/android:chrome_staging_test_support_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/android:chrome_java_resources",
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/invalidation:java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
@@ skipping 90 matching lines @@
   version_name = "Developer Build"
   version_code = "1"
   android_manifest = get_target_outputs(":chrome_public_apk_manifest")
   android_manifest = android_manifest[1]
   apk_name = "ChromePublic"
   native_libs = [ "$root_build_dir/lib.stripped/libchrome_public.so" ]
   native_lib_version_name = _version_full
   asset_location = chrome_public_apk_assets_dir
 
   deps = [
+    ":chrome_java",
     ":chrome_java_resources",
-    ":chrome_staging_java",
     ":chrome_public",
     ":chrome_public_apk_assets",
     ":chrome_public_apk_manifest",
     ":chrome_public_template_resources",
     "//base:base_java",
     "//third_party/android_tools:google_play_services_default_resources",
   ]
 }
 
 chrome_public_test_apk_manifest =
@@ skipping 12 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"
 }