Fix build.gn for androidx and remove todo.

Bug: 1052460
Change-Id: I7ac24b7727003304040d15492faeaacd3e417aa5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2109134Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Simeon Anfinrud <sanfin@chromium.org>
Commit-Queue: benjamin joyce <bjoyce@google.com>
Cr-Commit-Position: refs/heads/master@{#751808}

chrome/android/BUILD.gn

@@ -166,9 +166,9 @@ android_resources("chrome_app_java_resources") {
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//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_android_support_preference_v7_java",
   ]
   custom_package = "org.chromium.chrome"
 }
@@ -382,11 +382,11 @@ android_library("chrome_java") {
     "//third_party/android_deps:androidx_core_core_java",
     "//third_party/android_deps:androidx_gridlayout_gridlayout_java",
     "//third_party/android_deps:androidx_mediarouter_mediarouter_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_android_support_preference_v7_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",
@@ -898,9 +898,9 @@ android_library("chrome_test_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_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_android_support_preference_v7_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",

chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunViewPager.java

@@ -7,8 +7,6 @@ package org.chromium.chrome.browser.firstrun;
 import android.content.Context;
 import android.view.MotionEvent;
 
-// TODO(bjoyce): Need to convert fragment in FirstRunActivity.java before this
-// can be converted to Androidx.
 import androidx.viewpager.widget.ViewPager;
 
 /**

chrome/browser/settings/BUILD.gn

@@ -26,7 +26,7 @@ android_library("java") {
     "//chrome/browser/util:java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_preference_v7_java",
+    "//third_party/android_deps:androidx_preference_preference_java",
 
     # TODO(crbug.com/1017190): Remove the following deps once we stop linting individual targets.
     "//components/browser_ui/styles/android:java_resources",
@@ -39,7 +39,7 @@ android_resources("java_resources") {
   deps = [
     "//chrome/browser/ui/android/strings:ui_strings_grd",
     "//components/browser_ui/styles/android:java_resources",
-    "//third_party/android_deps:com_android_support_preference_v7_java",
+    "//third_party/android_deps:androidx_preference_preference_java",
     "//third_party/android_deps:com_google_android_material_material_java",
     "//ui/android:ui_java_resources",
   ]

third_party/android_deps/BUILD.gn

@@ -200,24 +200,6 @@ java_group("com_android_support_palette_v7_java") {
   ]
 }
 
-java_group("com_android_support_preference_v14_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_legacy_legacy_preference_v14_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_preference_v14_java_orig/classes.jar" ]
-}
-
-java_group("com_android_support_preference_v7_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_preference_preference_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_preference_v7_java_orig/classes.jar",
-  ]
-}
-
 java_group("com_android_support_recyclerview_v7_java") {
   deps = [
     ":${target_name}_orig__unpack_aar",
@@ -309,14 +291,10 @@ java_group("com_android_support_versionedparcelable_java") {
 
 # The dependencies below are used by chromecast internal.
 java_group("android_support_v7_preference_java") {
-  deps = [ ":com_android_support_preference_v7_java" ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_preference_v7_java_orig/classes.jar",
-  ]
+  deps = [ ":androidx_preference_preference_java" ]
 }
 java_group("android_support_v14_preference_java") {
-  deps = [ ":com_android_support_preference_v14_java" ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_preference_v14_java_orig/classes.jar" ]
+  deps = [ ":androidx_legacy_legacy_preference_v14_java" ]
 }
 java_group("android_support_v17_leanback_java") {
   deps = [ ":androidx_leanback_leanback_java" ]
@@ -981,8 +959,8 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
     ":com_android_support_appcompat_v7_java_orig",
     ":com_android_support_collections_java_orig",
     ":com_android_support_leanback_v17_java",
-    ":com_android_support_preference_v14_java_orig",
-    ":com_android_support_preference_v7_java_orig",
+    ":com_android_support_preference_v14_java",
+    ":com_android_support_preference_v7_java",
     ":com_android_support_recyclerview_v7_java_orig",
   ]
   skip_jetify = true
@@ -990,7 +968,7 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_preference_v7_java_orig") {
+android_aar_prebuilt("com_android_support_preference_v7_java") {
   aar_path = "libs/com_android_support_preference_v7/preference-v7-28.0.0.aar"
   info_path = "libs/com_android_support_preference_v7/com_android_support_preference_v7.info"
   deps = [
@@ -1067,7 +1045,7 @@ android_aar_prebuilt("com_android_support_support_core_ui_java_orig") {
     ":com_android_support_customview_java",
     ":com_android_support_drawerlayout_java_orig",
     ":com_android_support_interpolator_java_orig",
-    ":com_android_support_slidingpanelayout_java_orig",
+    ":com_android_support_slidingpanelayout_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
     ":com_android_support_support_core_utils_java_orig",
@@ -1082,10 +1060,10 @@ android_aar_prebuilt("com_android_support_support_core_utils_java_orig") {
   aar_path = "libs/com_android_support_support_core_utils/support-core-utils-28.0.0.aar"
   info_path = "libs/com_android_support_support_core_utils/com_android_support_support_core_utils.info"
   deps = [
-    ":com_android_support_documentfile_java_orig",
+    ":com_android_support_documentfile_java",
     ":com_android_support_loader_java_orig",
     ":com_android_support_localbroadcastmanager_java_orig",
-    ":com_android_support_print_java_orig",
+    ":com_android_support_print_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
   ]
@@ -1964,7 +1942,7 @@ android_aar_prebuilt("com_android_support_cursoradapter_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_documentfile_java_orig") {
+android_aar_prebuilt("com_android_support_documentfile_java") {
   aar_path = "libs/com_android_support_documentfile/documentfile-28.0.0.aar"
   info_path = "libs/com_android_support_documentfile/com_android_support_documentfile.info"
 
@@ -2027,7 +2005,7 @@ android_aar_prebuilt("com_android_support_palette_v7_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_preference_v14_java_orig") {
+android_aar_prebuilt("com_android_support_preference_v14_java") {
   aar_path = "libs/com_android_support_preference_v14/preference-v14-28.0.0.aar"
   info_path = "libs/com_android_support_preference_v14/com_android_support_preference_v14.info"
 
@@ -2035,12 +2013,12 @@ android_aar_prebuilt("com_android_support_preference_v14_java_orig") {
   # //third_party/android_deps/build.gradle.
   visibility = [ ":*" ]
   skip_jetify = true
-  deps = [ ":com_android_support_preference_v7_java_orig" ]
+  deps = [ ":com_android_support_preference_v7_java" ]
   jar_excluded_patterns = [ "androidx/preference/R*" ]
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_print_java_orig") {
+android_aar_prebuilt("com_android_support_print_java") {
   aar_path = "libs/com_android_support_print/print-28.0.0.aar"
   info_path = "libs/com_android_support_print/com_android_support_print.info"
 
@@ -2052,7 +2030,7 @@ android_aar_prebuilt("com_android_support_print_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_slidingpanelayout_java_orig") {
+android_aar_prebuilt("com_android_support_slidingpanelayout_java") {
   aar_path =
       "libs/com_android_support_slidingpanelayout/slidingpanelayout-28.0.0.aar"
   info_path = "libs/com_android_support_slidingpanelayout/com_android_support_slidingpanelayout.info"