commit 22efcc114ec6916398edca11c9e30080d942886c
author Paul Duffin <paulduffin@google.com> Thu Jan 24 16:01:40 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 24 16:01:40 2019 +0000
tree e9de188a2cc446e8aa40d3f4cf12aca00e50032f
parent 9f5ed1722550ebe06115ef7e003b86e33b0b901c
parent fd24c9fe1f1f09f512db6ef138fa0d04da0629ca

Merge "Remove REMOVE_OAHL_FROM_BCP flag"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 486193d..ab0ec6d 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -212,11 +212,6 @@
 HIDDENAPI_EXTRA_APP_USAGE_JARS := \
     core-oj-hiddenapi \
 
-# Default to remove the org.apache.http.legacy from bootclasspath
-ifeq ($(REMOVE_OAHL_FROM_BCP),)
-REMOVE_OAHL_FROM_BCP := true
-endif
-
 # ###############################################################
 # Broken build defaults
 # ###############################################################

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 4a3ae4d..d6c8421 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -290,15 +290,6 @@
     /apex/com.android.conscrypt/javalib/conscrypt.jar
 
 
-# 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
-PRODUCT_BOOT_JARS += framework-oahl-backward-compatibility
-else
-PRODUCT_BOOT_JARS += org.apache.http.legacy
-endif
-
 PRODUCT_COPY_FILES += \
     system/core/rootdir/init.usb.rc:root/init.usb.rc \
     system/core/rootdir/init.usb.configfs.rc:root/init.usb.configfs.rc \