Conditionally remove oahl from bootclasspath
If REMOVE_OAHL_FROM_BCP=true then this adds the
framework-oahl-backward-compatibility library to the bootclasspath.
Otherwise, it adds the org.apache.http.legacy instead.
Bug: 18027885
Bug: 72375096
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I17170f873eec93b2e2ed7be3459e2d28c96bbe4c
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 9651179..389b771 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -116,10 +116,15 @@
telephony-common \
voip-common \
ims-common \
- org.apache.http.legacy.boot \
android.hidl.base-V1.0-java \
android.hidl.manager-V1.0-java
+ifeq ($(REMOVE_OAHL_FROM_BCP),true)
+PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
+else
+PRODUCT_BOOT_JARS += org.apache.http.legacy.boot
+endif
+
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \
services \
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index d1779a5..695f083 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -100,10 +100,15 @@
telephony-common \
voip-common \
ims-common \
- org.apache.http.legacy.boot \
android.hidl.base-V1.0-java \
android.hidl.manager-V1.0-java
+ifeq ($(REMOVE_OAHL_FROM_BCP),true)
+PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
+else
+PRODUCT_BOOT_JARS += org.apache.http.legacy.boot
+endif
+
# The order of PRODUCT_SYSTEM_SERVER_JARS matters.
PRODUCT_SYSTEM_SERVER_JARS := \
services \