From 24f62069d00758eb7b37b9dd61b4f01e6621665f Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 2 Apr 2021 10:59:32 +0100 Subject: [PATCH] Remove use of REMOVE_ATB_FROM_BCP This change cleans up after the work to remove the android.test.base classes from the bootclasspath. That work allowed the presence of android.test.base in the bootclasspath to be configured at build time to allow the changes to be tested without affecting the standard Android builds and avoiding having to repeatedly reapply/revert the changes that excluded android.test.base from the bootclasspath. That change has been applied and stuck and no builds change the default by setting REMOVE_ATB_FROM_BCP=false so we no longer need to support that capability. This change removes the build time switch to add framework-atb-backward-compatibility to the bootclasspath and another change in the same topic merges those classes into the framework-minus-apex module. So, while a module has been removed from the bootclasspath the classes available on it have not changed. Bug: 184331423 Test: m nothing Change-Id: I9dadaf8b0c2684bf1983b353bb2acf4f42655e1a --- target/product/default_art_config.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 15457803f..bb17dda3c 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -39,16 +39,6 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ 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