[Sync] //components/sync external changes [DO NOT SUBMIT]

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_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 221 matching lines @@
       "//components/dom_distiller/android:dom_distiller_core_java",
       "//components/gcm_driver/android:gcm_driver_java",
       "//components/gcm_driver/instance_id/android:instance_id_driver_java",
       "//components/invalidation/impl:java",
       "//components/location/android:location_java",
       "//components/navigation_interception/android:navigation_interception_java",
       "//components/policy/android:policy_java",
       "//components/precache/android:precache_java",
       "//components/safe_json/android:safe_json_java",
       "//components/signin/core/browser/android:java",
+      "//components/sync/android:sync_java",
       "//components/web_contents_delegate_android:web_contents_delegate_android_java",
-      "//sync/android:sync_java",
     ]
   }
 }
 
 # GYP: //chrome/chrome_browser.gypi:activity_type_ids_java
 # GYP: //chrome/chrome_browser.gypi:connectivity_check_result_java
 # GYP: //chrome/chrome_browser.gypi:shortcut_source_java
 # GYP: //chrome/chrome_browser.gypi:profile_account_management_metrics_java
 # GYP: //chrome/chrome_browser.gypi:tab_load_status_java
 # GYP: //chrome/chrome_browser.gypi:infobar_action_type_java
@@ skipping 46 matching lines @@
   # From java_sources.gni.
   java_files = chrome_junit_test_java_sources
   deps = [
     ":chrome_java",
     ":chrome_java_resources",
     "//base:base_java",
     "//base:base_java_test_support",
     "//base:base_junit_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/invalidation/impl:java",
+    "//components/sync:sync_java_test_support",
+    "//components/sync/android:sync_java",
     "//components/web_restrictions:web_restrictions_java",
     "//content/public/android:content_java",
     "//net/android:net_java",
-    "//sync:sync_java_test_support",
-    "//sync/android:sync_java",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/junit:hamcrest",
     "//ui/android:ui_java",
     google_play_services_library,
   ]
 }
 
@@ skipping 36 matching lines @@
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/dom_distiller/android:dom_distiller_core_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/invalidation/impl:java",
     "//components/invalidation/impl:javatests",
     "//components/location/android:location_java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
     "//components/precache/android:precache_java",
     "//components/precache/android:precache_javatests",
+    "//components/sync:sync_java_test_support",
+    "//components/sync/android:sync_java",
+    "//components/sync/android:sync_javatests",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:web_restrictions_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//mojo/public/java:bindings",
     "//mojo/public/java:system",
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//printing:printing_java",
-    "//sync:sync_java_test_support",
-    "//sync/android:sync_java",
-    "//sync/android:sync_javatests",
     "//third_party/WebKit/public:android_mojo_bindings_java",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_design_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/android_tools:legacy_http_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/custom_tabs_client:custom_tabs_support_lib",
     "//third_party/jsr-305:jsr_305_javalib",
     "//ui/android:ui_java",
@@ skipping 93 matching lines @@
     ]
   }
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:libchrome_sync_shell
 shared_library("chrome_sync_shell") {
   testonly = true
   deps = [
     "//build/config/sanitizers:deps",
     "//chrome:chrome_android_core",
-    "//sync",
-    "//sync:test_support_sync_fake_server_android",
+    "//components/sync",
+    "//components/sync:test_support_sync_fake_server_android",
   ]
   sources = chrome_apk_gypi.chrome_sync_shell_app_native_sources
 }
 
 # Contains rules common to chrome_public_apk and chrome_sync_shell_apk
 template("chrome_public_apk_tmpl_shared") {
   chrome_public_apk_tmpl(target_name) {
     forward_variables_from(invoker, "*")
 
     native_lib_version_rule = "//build/util:chrome_version_json"
@@ skipping 26 matching lines @@
   android_manifest_dep = ":chrome_sync_shell_apk_manifest"
   apk_name = "ChromeSyncShell"
   shared_libraries = [ ":chrome_sync_shell" ]
 
   deps = [
     ":chrome_sync_shell_apk_template_resources",
 
     # This exists here because com.google.protobuf.nano is needed in tests,
     # but that code is stripped out via proguard. Adding this deps adds
     # usages and prevents removal of the proto code.
-    "//sync:test_support_sync_proto_java",
+    "//components/sync:test_support_sync_proto_java",
   ]
 }
 
 chrome_public_test_apk_manifest =
     "$root_gen_dir/chrome_public_test_apk_manifest/AndroidManifest.xml"
 chrome_sync_shell_test_apk_manifest =
     "$root_gen_dir/chrome_sync_shell_test_apk_manifest/AndroidManifest.xml"
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk_manifest
 jinja_template("chrome_public_test_apk_manifest") {
@@ skipping 38 matching lines @@
   # From java_sources.jni.
   java_files = sync_shell_test_java_sources
 
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/policy/android:policy_java",
+    "//components/sync:sync_java_test_support",
+    "//components/sync:test_support_sync_proto_java",
+    "//components/sync/android:sync_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
-    "//sync:sync_java_test_support",
-    "//sync:test_support_sync_proto_java",
-    "//sync/android:sync_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//ui/android:ui_java",
   ]
 }
 
 if (!enable_all_proguard_optimizations) {
   # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
   instrumentation_test_apk("chrome_sync_shell_test_apk") {
     apk_name = "ChromeSyncShellTest"
     apk_under_test = ":chrome_sync_shell_apk"
     android_manifest = chrome_sync_shell_test_apk_manifest
     android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
     deps = [
       ":chrome_sync_shell_test_apk_java",
     ]
     proguard_enabled = !is_java_debug
   }
 }