Merge "Ensure framework-oahl-backward-compatibility is installed"

2018-01-26 22:36:45 +00:00 · 2018-01-26 22:36:45 +00:00 · 275d713b59
parent e66c468790 7e4be2c085
commit 275d713b59
1 changed files with 6 additions and 0 deletions
--- a/target/product/base.mk
+++ b/target/product/base.mk
@ -141,6 +141,12 @@ PRODUCT_PACKAGES += \
    vold \
    wm

+# Add the compatibility library that is needed when org.apache.http.legacy
+# is removed from the bootclasspath.
+ifeq ($(REMOVE_OAHL_FROM_BCP),true)
+PRODUCT_PACKAGES += framework-oahl-backward-compatibility
+endif
+
 # Essential HAL modules
 PRODUCT_PACKAGES += \
    android.hardware.cas@1.0-service \