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

Commit fd24c9fe authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove REMOVE_OAHL_FROM_BCP flag 

The REMOVE_OAHL_FROM_BCP flag is always set to true and is no longer
necessary so this change removes any uses of the flag.

Bug: 18027885
Test: cts/tests/signature/runSignatureTest.sh
Change-Id: Ied8c3315b29094ad6acee539520af3e4c9e79839
parent e8f1a420

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
@@ -291,15 +291,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 \