Reland after fix for FeatureHighlightProviderImpl

Bug: 1067070, 1067050
Change-Id: Id6814d5875ea1df4472422fbfd3121e67cf0d7e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2137676
Commit-Queue: benjamin joyce <bjoyce@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#757913}

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListViewBinder.java

@@ -8,8 +8,6 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
 import android.os.Build;
-import android.support.graphics.drawable.AnimatedVectorDrawableCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -17,6 +15,8 @@ import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.tab_ui.R;

chrome/browser/ui/messages/android/BUILD.gn

@@ -56,7 +56,7 @@ android_library("java") {
     "//components/browser_ui/widget/android:java",
     "//components/infobars/core:infobar_enums_java",
     "//third_party/android_deps:androidx_annotation_annotation_java",
-    "//third_party/android_deps:com_android_support_appcompat_v7_java",
+    "//third_party/android_deps:androidx_appcompat_appcompat_java",
     "//ui/android:ui_full_java",
     "//ui/android:ui_utils_java",
   ]

third_party/android_deps/BUILD.gn

@@ -25,15 +25,13 @@ java_group("android_support_v4_java") {
 java_group("android_support_v7_appcompat_java") {
   deps = [
     ":android_support_v4_java",
-    ":com_android_support_animated_vector_drawable_java",
-    ":com_android_support_appcompat_v7_java",
-    ":com_android_support_support_vector_drawable_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_appcompat_v7_java_orig/classes.jar",
-    "${target_out_dir}/com_android_support_animated_vector_drawable_java_orig/classes.jar",
-    "${target_out_dir}/com_android_support_support_vector_drawable_java_orig/classes.jar",
+    ":androidx_appcompat_appcompat_java",
+    ":androidx_vectordrawable_vectordrawable_animated_java",
+    ":androidx_vectordrawable_vectordrawable_java",
+    ":com_android_support_appcompat_v7_java__unpack_aar",
   ]
+  input_jars_paths =
+      [ "${target_out_dir}/com_android_support_appcompat_v7_java/classes.jar" ]
 }
 
 java_group("android_arch_lifecycle_common_java") {
@@ -51,22 +49,14 @@ java_group("android_arch_lifecycle_viewmodel_java") {
   ]
 }
 
-java_group("com_android_support_animated_vector_drawable_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_vectordrawable_vectordrawable_animated_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_animated_vector_drawable_java_orig/classes.jar" ]
+# TODO (bjoyce): Remove when downstream bots can call this directly.
+java_group("com_android_support_animated_vector_drawable_java_temp") {
+  deps = [ ":com_android_support_animated_vector_drawable_java" ]
 }
 
-java_group("com_android_support_appcompat_v7_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_appcompat_appcompat_java",
-  ]
-  input_jars_paths = [
-    "${target_out_dir}/com_android_support_appcompat_v7_java_orig/classes.jar",
-  ]
+# TODO (bjoyce): Remove when downstream bots can call this directly.
+java_group("com_android_support_appcompat_v7_java_temp") {
+  deps = [ ":com_android_support_appcompat_v7_java" ]
 }
 
 java_group("com_android_support_cardview_v7_java") {
@@ -188,12 +178,9 @@ java_group("com_android_support_support_v4_java") {
   ]
 }
 
-java_group("com_android_support_support_vector_drawable_java") {
-  deps = [
-    ":${target_name}_orig__unpack_aar",
-    ":androidx_vectordrawable_vectordrawable_java",
-  ]
-  input_jars_paths = [ "${target_out_dir}/com_android_support_support_vector_drawable_java_orig/classes.jar" ]
+# TODO (bjoyce): Remove when downstream bots can call this directly.
+java_group("com_android_support_support_vector_drawable_java_temp") {
+  deps = [ ":com_android_support_support_vector_drawable_java" ]
 }
 
 java_group("com_android_support_versionedparcelable_java") {
@@ -779,18 +766,18 @@ android_aar_prebuilt("androidx_viewpager_viewpager_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_appcompat_v7_java_orig") {
+android_aar_prebuilt("com_android_support_appcompat_v7_java") {
   aar_path = "libs/com_android_support_appcompat_v7/appcompat-v7-28.0.0.aar"
   info_path = "libs/com_android_support_appcompat_v7/com_android_support_appcompat_v7.info"
   deps = [
-    ":com_android_support_animated_vector_drawable_java_orig",
+    ":com_android_support_animated_vector_drawable_java",
     ":com_android_support_collections_java_orig",
     ":com_android_support_cursoradapter_java",
     ":com_android_support_support_annotations_java_orig",
     ":com_android_support_support_compat_java_orig",
     ":com_android_support_support_core_utils_java_orig",
     ":com_android_support_support_fragment_java_orig",
-    ":com_android_support_support_vector_drawable_java_orig",
+    ":com_android_support_support_vector_drawable_java",
   ]
   skip_jetify = true
   jar_excluded_patterns = [ "androidx/appcompat/R*" ]
@@ -857,7 +844,7 @@ android_aar_prebuilt("com_android_support_design_java_orig") {
   aar_path = "libs/com_android_support_design/design-28.0.0.aar"
   info_path = "libs/com_android_support_design/com_android_support_design.info"
   deps = [
-    ":com_android_support_appcompat_v7_java_orig",
+    ":com_android_support_appcompat_v7_java",
     ":com_android_support_cardview_v7_java_orig",
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_annotations_java_orig",
@@ -915,7 +902,7 @@ android_aar_prebuilt("com_android_support_mediarouter_v7_java_orig") {
   aar_path = "libs/com_android_support_mediarouter_v7/mediarouter-v7-28.0.0.aar"
   info_path = "libs/com_android_support_mediarouter_v7/com_android_support_mediarouter_v7.info"
   deps = [
-    ":com_android_support_appcompat_v7_java_orig",
+    ":com_android_support_appcompat_v7_java",
     ":com_android_support_palette_v7_java",
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_media_compat_java_orig",
@@ -939,7 +926,7 @@ android_aar_prebuilt("com_android_support_preference_leanback_v17_java") {
   aar_path = "libs/com_android_support_preference_leanback_v17/preference-leanback-v17-28.0.0.aar"
   info_path = "libs/com_android_support_preference_leanback_v17/com_android_support_preference_leanback_v17.info"
   deps = [
-    ":com_android_support_appcompat_v7_java_orig",
+    ":com_android_support_appcompat_v7_java",
     ":com_android_support_collections_java_orig",
     ":com_android_support_leanback_v17_java",
     ":com_android_support_preference_v14_java",
@@ -955,7 +942,7 @@ 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 = [
-    ":com_android_support_appcompat_v7_java_orig",
+    ":com_android_support_appcompat_v7_java",
     ":com_android_support_collections_java_orig",
     ":com_android_support_recyclerview_v7_java_orig",
     ":com_android_support_support_compat_java_orig",
@@ -1901,7 +1888,7 @@ android_aar_prebuilt("androidx_versionedparcelable_versionedparcelable_java") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_animated_vector_drawable_java_orig") {
+android_aar_prebuilt("com_android_support_animated_vector_drawable_java") {
   aar_path = "libs/com_android_support_animated_vector_drawable/animated-vector-drawable-28.0.0.aar"
   info_path = "libs/com_android_support_animated_vector_drawable/com_android_support_animated_vector_drawable.info"
 
@@ -1910,7 +1897,7 @@ android_aar_prebuilt("com_android_support_animated_vector_drawable_java_orig") {
   visibility = [ ":*" ]
   deps = [
     ":com_android_support_support_core_ui_java_orig",
-    ":com_android_support_support_vector_drawable_java_orig",
+    ":com_android_support_support_vector_drawable_java",
   ]
   skip_jetify = true
 }
@@ -2050,7 +2037,7 @@ android_aar_prebuilt("com_android_support_support_media_compat_java_orig") {
 }
 
 # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("com_android_support_support_vector_drawable_java_orig") {
+android_aar_prebuilt("com_android_support_support_vector_drawable_java") {
   aar_path = "libs/com_android_support_support_vector_drawable/support-vector-drawable-28.0.0.aar"
   info_path = "libs/com_android_support_support_vector_drawable/com_android_support_support_vector_drawable.info"
 

third_party/custom_tabs_client/BUILD.gn

@@ -132,7 +132,8 @@ android_library("custom_tabs_support_java") {
     # TODO (bjoyce): Restore to android_support_v7_appcompat_java once source
     # files are manually written to androidx crbug.com/1047843.
     # "//third_party/android_deps:android_support_v7_appcompat_java",
-    "//third_party/android_deps:com_android_support_appcompat_v7_java_orig",
+    # Remove _temp target once upstream is compatible.
+    "//third_party/android_deps:com_android_support_appcompat_v7_java_temp",
     "//third_party/android_deps:com_android_support_collections_java_orig",
     "//third_party/android_deps:com_android_support_interpolator_java",
     "//third_party/android_deps:com_android_support_support_annotations_java",