Merge "Remove framework-atb-backward-compatibility" am: 9f82ba21f1 am: 4f48fa4d6f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1663339

Change-Id: I5a84342d6ae724e23f0e15edd3681ad327cc95fe

Android.bp

@@ -296,8 +296,6 @@ java_library {
         ":framework-connectivity-sources",
         "core/java/**/*.logtags",
     ],
-    // See comment on framework-atb-backward-compatibility module below
-    exclude_srcs: ["core/java/android/content/pm/AndroidTestBaseUpdater.java"],
     aidl: {
         generate_get_transaction_name: true,
     },
@@ -378,20 +376,6 @@ platform_compat_config {
     src: ":framework-minus-apex",
 }
 
-// A temporary build target that is conditionally included on the bootclasspath if
-// android.test.base library has been removed and which provides support for
-// maintaining backwards compatibility for APKs that target pre-P and depend on
-// android.test.base classes. This is used iff REMOVE_ATB_FROM_BCP=true is
-// specified on the build command line.
-java_library {
-    name: "framework-atb-backward-compatibility",
-    installable: true,
-    libs: ["app-compat-annotations"],
-    srcs: [
-        "core/java/android/content/pm/AndroidTestBaseUpdater.java",
-    ],
-}
-
 genrule {
     name: "statslog-framework-java-gen",
     tools: ["stats-log-api-gen"],

core/tests/coretests/Android.bp

@@ -61,7 +61,6 @@ android_test {
         "org.apache.http.legacy",
         "android.test.base",
         "android.test.mock",
-        "framework-atb-backward-compatibility",
         "framework",
         "ext",
         "framework-res",