Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d2a8a56 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Remove REMOVE_OAHL_FROM_BCP flag" am: 22efcc11 

am: 5941366c

Change-Id: I1078642bd545e387b9e43184ca8f03a1b685d70f
parents 9828c286 5941366c

core/config.mk

+0 −5
Original line number Diff line number Diff line
@@ -212,11 +212,6 @@ endif 
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

+0 −9
Original line number Diff line number Diff line
@@ -290,15 +290,6 @@ PRODUCT_UPDATABLE_BOOT_LOCATIONS := \ 
    /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 \