From 86702c24f439346a646420490e9af19bfbd976a3 Mon Sep 17 00:00:00 2001 From: Ben Fennema Date: Tue, 3 Apr 2018 21:32:01 -0700 Subject: [PATCH] Fix: Conditionally remove atb from bootclasspath for core_tiny.xml Seems to be a cut-and-paste error in ag/3520851 base and core_minimal use REMOVE_ATB_FROM_BCP, core_tiny used REMOVE_OAHL_FROM_BCP (cut and pasted from the section above for framework-oahl-backward-compatibility) Bug: 74074575 Bug: 30188076 Test: no more of the following on wear: Unable to open boot classpath entry: /system/framework/framework-atb-backward-compatibility.jar Signed-off-by: Ben Fennema Change-Id: I25327705ff37ab3d077b3917fcca096c398eb3ee --- target/product/core_tiny.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index ce45284b4..48a044bdd 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -109,7 +109,7 @@ else PRODUCT_BOOT_JARS += org.apache.http.legacy.boot endif -ifeq ($(REMOVE_OAHL_FROM_BCP),true) +ifeq ($(REMOVE_ATB_FROM_BCP),true) PRODUCT_BOOT_JARS += framework-atb-backward-compatibility else PRODUCT_BOOT_JARS += android.test.base