Update build.gn files to AndroidX.

Updates design, annotations, and lifecycle_commons

Bug: 1052460
Change-Id: I521d955abfe883868473d3b293854f2105ee8852
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2116594Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#752702}

base/BUILD.gn

@@ -3245,13 +3245,10 @@ if (is_android) {
     deps = [
       ":jni_java",
       "//third_party/android_deps:android_support_v4_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//third_party/android_deps:androidx_collection_collection_java",
       "//third_party/android_deps:androidx_core_core_java",
       "//third_party/android_deps:androidx_multidex_multidex_java",
-
-      # TODO(bjoyce): Convert to androidx_annotation_annotation_java after
-      # net/android is converted.
-      "//third_party/android_deps:com_android_support_support_annotations_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
 

chrome/android/BUILD.gn

@@ -194,7 +194,7 @@ android_resources("chrome_app_java_resources") {
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_android_support_design_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
   ]
   custom_package = "org.chromium.chrome"
 }
@@ -400,13 +400,13 @@ android_library("chrome_java") {
     "//services/shape_detection/public/mojom:mojom_java",
     "//skia/public/mojom:mojom_java",
     "//third_party/android_data_chart:android_data_chart_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_coordinatorlayout_coordinatorlayout_java",
     "//third_party/android_deps:androidx_customview_customview_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java8_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
 
@@ -418,8 +418,8 @@ android_library("chrome_java") {
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_viewpager_viewpager_java",
-    "//third_party/android_deps:com_android_support_design_java",
     "//third_party/android_deps:com_android_support_interpolator_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_dagger_dagger_java",
     "//third_party/android_deps:com_google_guava_listenablefuture_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
@@ -744,9 +744,9 @@ junit_binary("chrome_junit_tests") {
     "//mojo/public/java:system_java",
     "//net/android:net_java",
     "//services/media_session/public/cpp/android:media_session_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_googlecode_java_diff_utils_diffutils_java",
@@ -928,13 +928,13 @@ android_library("chrome_test_java") {
     "//services/network/public/mojom:mojom_java",
     "//services/service_manager/public/java:service_manager_java",
     "//third_party/android_data_chart:android_data_chart_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
-    "//third_party/android_deps:com_android_support_design_java",
+    "//third_party/android_deps:com_google_android_material_material_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_sdk:android_test_base_java",
     "//third_party/android_sdk:android_test_mock_java",
@@ -1034,9 +1034,9 @@ if (enable_vr || enable_arcore) {
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java_test_support",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_sdk/androidx_browser:androidx_browser_java",
     "//third_party/android_support_test_runner:rules_java",

chrome/android/features/autofill_assistant/BUILD.gn

@@ -45,7 +45,6 @@ android_library("java") {
     "//components/url_formatter/android:url_formatter_java",
     "//content/public/android:content_java",
     "//mojo/public/java:bindings_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_collection_collection_java",
@@ -54,6 +53,7 @@ android_library("java") {
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_ui_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_core_utils_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_google_android_material_material_java",

chrome/android/features/cablev2_authenticator/internal/BUILD.gn

@@ -26,7 +26,7 @@ if (enable_android_cablev2_authenticator) {
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
       "//third_party/android_deps:android_support_v7_appcompat_java",
-      "//third_party/android_deps:com_android_support_support_annotations_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
       "//ui/android:ui_full_java",
     ]
 
@@ -56,7 +56,7 @@ if (enable_android_cablev2_authenticator) {
     deps = [
       # This is needed to prevent a build-error. See comment in
       # https://chromium-review.googlesource.com/c/chromium/src/+/2079613/12/chrome/android/features/cablev2_authenticator/internal/BUILD.gn#9
-      "//third_party/android_deps:com_android_support_support_annotations_java",
+      "//third_party/android_deps:androidx_annotation_annotation_java",
     ]
   }
   source_set("jni_headers") {

chrome/android/features/tab_ui/BUILD.gn

@@ -190,11 +190,11 @@ android_library("java") {
     "//components/search_engines/android:java",
     "//content/public/android:content_java",
     "//content/public/android:content_java_resources",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v13_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",

chrome/android/features/test_dummy/internal/BUILD.gn

@@ -51,7 +51,7 @@ android_library("base_module_java") {
     "//chrome/android/modules/test_dummy/provider:java",
     "//chrome/android/modules/test_dummy/public:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_support_annotations_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
   sources = [
     "java/src/org/chromium/chrome/features/test_dummy/TestDummyActivity.java",

chrome/android/features/vr/BUILD.gn

@@ -82,9 +82,9 @@ android_library("java") {
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//device/vr:java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_runtime_java",
     "//third_party/android_deps:androidx_lifecycle_lifecycle_viewmodel_java",
     "//third_party/gvr-android-keyboard:kb_java",

chrome/android/feed/feed_java_sources.gni

@@ -10,10 +10,10 @@ if (enable_feed_in_chrome) {
     "//components/feed/core/proto:proto_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
+    "//third_party/android_deps:androidx_cardview_cardview_java",
     "//third_party/android_deps:androidx_collection_collection_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:androidx_swiperefreshlayout_swiperefreshlayout_java",
-    "//third_party/android_deps:com_android_support_cardview_v7_java",
     "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",
     "//third_party/android_deps:javax_inject_javax_inject_java",

chrome/test/android/BUILD.gn

@@ -229,11 +229,11 @@ android_library("chrome_java_test_support") {
     "//net/android:net_java",
     "//net/android:net_java_test_support",
     "//testing/android/reporter:reporter_java",
-    "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_legacy_legacy_support_v4_java",
+    "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
     "//third_party/android_deps:androidx_recyclerview_recyclerview_java",
     "//third_party/android_deps:com_android_support_appcompat_v7_java",
     "//third_party/android_deps:com_android_support_support_fragment_java",

components/cronet/android/BUILD.gn

@@ -440,7 +440,7 @@ android_library("cronet_sample_apk_java") {
     ":package_api_java",
     ":package_impl_native_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_support_annotations_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 }
 

components/signin/public/android/BUILD.gn

@@ -7,7 +7,7 @@ android_library("java") {
     "//components/signin/core/browser/android:java",
     "//net/android:net_java",
     "//third_party/android_deps:android_support_v4_java",
-    "//third_party/android_deps:com_android_support_support_annotations_java",
+    "//third_party/android_deps:androidx_annotation_annotation_java",
   ]
 
   srcjar_deps = [

remoting/android/client_java_tmpl.gni

@@ -87,9 +87,9 @@ template("remoting_android_client_java_tmpl") {
       "//remoting/android:remoting_android_client_java_resources",
       "//remoting/android:remoting_apk_manifest",
       "//remoting/proto/remoting/v1:directory_proto_java",
-      "//third_party/android_deps:android_arch_lifecycle_common_java",
       "//third_party/android_deps:android_support_v7_appcompat_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_lifecycle_lifecycle_common_java",
       "//third_party/android_deps:com_android_support_drawerlayout_java",
       "//third_party/android_deps:com_android_support_mediarouter_v7_java",
       "//third_party/android_deps:com_google_protobuf_protobuf_javalite_java",

testing/android/native_test/BUILD.gn

@@ -56,6 +56,7 @@ android_library("native_test_java") {
     "//base:base_java_test_support",
     "//testing/android/reporter:reporter_java",
     "//third_party/android_deps:android_support_v4_java",
+    "//third_party/android_deps:com_android_support_support_annotations_java",
   ]
   sources = [
     "java/src/org/chromium/native_test/NativeBrowserTest.java",