commit 9910b5e43a8e9c781e2d8df99e83783df7fee882
author Paul Duffin <paulduffin@google.com> Tue Apr 06 14:09:30 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 06 14:09:30 2021 +0000
tree 71a1ac9663fb3ba76d0c611ccb81179a46c0d621
parent bebc8a35ef49335f59614b29937e0ab36cf248ed
parent 24f62069d00758eb7b37b9dd61b4f01e6621665f

Merge "Remove use of REMOVE_ATB_FROM_BCP"

target/product/default_art_config.mk

diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk
index 1545780..bb17dda 100644
--- a/target/product/default_art_config.mk
+++ b/target/product/default_art_config.mk
@@ -39,16 +39,6 @@
     com.android.tethering:framework-tethering \
     com.android.ipsec:android.net.ipsec.ike
 
-# Add the compatibility library that is needed when android.test.base
-# is removed from the bootclasspath.
-# Default to excluding android.test.base from the bootclasspath.
-ifneq ($(REMOVE_ATB_FROM_BCP),false)
-  PRODUCT_PACKAGES += framework-atb-backward-compatibility
-  PRODUCT_BOOT_JARS += framework-atb-backward-compatibility
-else
-  PRODUCT_BOOT_JARS += android.test.base
-endif
-
 # Minimal configuration for running dex2oat (default argument values).
 # PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.
 PRODUCT_USES_DEFAULT_ART_CONFIG := true