Convert base and build to use AndroidX libraries.

This CL was generated with android_studios. See https://developer.android.com/jetpack/androidx/migrate skip_jetify and changes added to build.gn targets. Bug: 1052460 Change-Id: I5914314dac0b3834c3d21d7a518a4f85560463ac Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2065634 Commit-Queue: benjamin joyce <bjoyce@google.com> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Reviewed-by: Yaron Friedman <yfriedman@chromium.org> Cr-Commit-Position: refs/heads/master@{#743344}
Denger-Network · Feb 21, 2020 · b7a11ea · b7a11ea
1 parent 36477d1
commit b7a11ea
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 18 deletions.
diff --git a/base/BUILD.gn b/base/BUILD.gn
@@ -3224,6 +3224,7 @@ if (is_android) {
   }
 
   android_library("base_java") {
+    skip_jetify = true
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
       ":base_build_config_gen",
@@ -3234,11 +3235,13 @@ 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:com_android_support_collections_java",
-      "//third_party/android_deps:com_android_support_multidex_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/android_deps:com_android_support_support_compat_java",
       "//third_party/jsr-305:jsr_305_javalib",
     ]
 
@@ -3452,16 +3455,17 @@ if (is_android) {
   }
 
   android_library("base_java_test_support") {
+    skip_jetify = true
     testonly = true
     deps = [
       ":base_java",
       ":jni_java",
       "//testing/android/reporter:reporter_java",
       "//third_party/android_deps:androidx_annotation_annotation_java",
+      "//third_party/android_deps:androidx_core_core_java",
       "//third_party/android_deps:androidx_test_monitor_java",
       "//third_party/android_deps:androidx_test_runner_java",
       "//third_party/android_deps:androidx_test_uiautomator_uiautomator_java",
-      "//third_party/android_deps:com_android_support_support_compat_java",
       "//third_party/android_sdk:android_support_chromium_java",
       "//third_party/android_sdk:android_test_base_java",
       "//third_party/android_sdk:android_test_mock_java",
@@ -3580,6 +3584,7 @@ if (is_android) {
   }
 
   junit_binary("base_junit_tests") {
+    skip_jetify = true
     sources = [
       "android/junit/src/org/chromium/base/AnimationFrameTimeHistogramTest.java",
       "android/junit/src/org/chromium/base/ApplicationStatusTest.java",
@@ -3643,6 +3648,7 @@ if (is_android) {
   }
 
   android_library("base_java_unittest_support") {
+    skip_jetify = true
     testonly = true
     deps = [ ":base_java" ]
     sources = [

diff --git a/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java b/base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java
@@ -31,7 +31,6 @@
 import android.os.StrictMode;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.support.v4.widget.ImageViewCompat;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -48,6 +47,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.widget.ImageViewCompat;
 
 import org.chromium.base.annotations.VerifiesOnLollipop;
 import org.chromium.base.annotations.VerifiesOnLollipopMR1;

diff --git a/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java b/base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java
@@ -10,12 +10,12 @@
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.SystemClock;
-import android.support.v4.content.ContextCompat;
 import android.system.Os;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.core.content.ContextCompat;
 
 import org.chromium.base.BaseSwitches;
 import org.chromium.base.BuildConfig;

diff --git a/base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java b/base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java
@@ -4,7 +4,7 @@
 
 package org.chromium.base.library_loader;
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

diff --git a/base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java b/base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java
@@ -4,10 +4,9 @@
 
 package org.chromium.base.metrics;
 
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-
 import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.Log;
 

diff --git a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java
@@ -8,9 +8,9 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.multidex.MultiDex;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.multidex.MultiDex;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;

diff --git a/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java b/base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java
@@ -13,9 +13,9 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.UserManager;
-import android.support.v4.util.ArraySet;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;

diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumRunnerCommon.java
@@ -9,7 +9,8 @@
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.support.v4.content.ContextCompat;
+
+import androidx.core.content.ContextCompat;
 
 import org.chromium.android.support.PackageManagerWrapper;
 import org.chromium.base.Log;

diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
@@ -6,11 +6,12 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.CallSuper;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 import android.support.test.internal.util.AndroidRunnerParams;
 
+import androidx.annotation.CallSuper;
+
 import org.junit.rules.MethodRule;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;

diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4TestRule.java b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4TestRule.java
@@ -7,9 +7,10 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.test.InstrumentationRegistry;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 
+import androidx.core.content.ContextCompat;
+
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;

diff --git a/build/android/bytecode/java/org/chromium/bytecode/ThreadAssertionClassAdapter.java b/build/android/bytecode/java/org/chromium/bytecode/ThreadAssertionClassAdapter.java
@@ -14,8 +14,8 @@
 /**
  * A ClassVisitor which adds calls to
  * {@link org.chromium.base.ThreadUtils}'s assertOnUiThread/assertOnBackgroundThread when the
- * corresponding {@link android.support.annotation.UiThread} or
- * {@link android.support.annotation.WorkerThread} annotations are present. The function calls
+ * corresponding {@link androidx.annotation.UiThread} or
+ * {@link androidx.annotation.WorkerThread} annotations are present. The function calls
  * are placed at the start of the method.
  */
 class ThreadAssertionClassAdapter extends ClassVisitor {