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

Commit afb35792 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Conditionally remove oahl from bootclasspath"

parents 95873268 3a4f2ed7

target/product/core_minimal.mk

+6 −1
Original line number Diff line number Diff line
@@ -116,10 +116,15 @@ PRODUCT_BOOT_JARS := \ 
    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

+6 −1
Original line number Diff line number Diff line
@@ -100,10 +100,15 @@ PRODUCT_BOOT_JARS := \ 
    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 \