From 20c056dacb3e66f1d93dc65257ae29b5681fea5e Mon Sep 17 00:00:00 2001
From: Paul Duffin <paulduffin@google.com>
Date: Fri, 2 Apr 2021 10:56:09 +0100
Subject: [PATCH] Remove framework-atb-backward-compatibility

The class in this library no longer needs to be conditionally included
on the bootclasspath based on the REMOVE_ATB_FROM_BCP flag so is being
built as part of framework-minus-apex.

Bug: 184331423
Test: m nothing
Change-Id: If7c2ec51be0670ffda22e18ce1e028783a1513e7
---
 Android.bp                      | 16 ----------------
 core/tests/coretests/Android.bp |  1 -
 2 files changed, 17 deletions(-)

diff --git a/Android.bp b/Android.bp
index 856e11ec110d8..3ae715967c8ca 100644
--- a/Android.bp
+++ b/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"],
diff --git a/core/tests/coretests/Android.bp b/core/tests/coretests/Android.bp
index 510578e1e50bc..5045e3b2cf99e 100644
--- a/core/tests/coretests/Android.bp
+++ b/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",