commit afb3579213aef174a8c6ad1879ddbb8f74738d22
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 24 09:04:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 24 09:04:39 2018 +0000
tree 6f5b246feb40e772b640b4cd03031a1c2dc4681b
parent 95873268f36210e196302afdb3006b271ad66e5a
parent 3a4f2ed718efd98fca42887c8394fa05a13356c4

Merge "Conditionally remove oahl from bootclasspath"

target/product/core_minimal.mk

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 \

target/product/core_tiny.mk

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 \