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

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

Conditionally remove atb from bootclasspath 

If REMOVE_ATB_FROM_BCP=true then this adds the
framework-atb-backward-compatibility library to the bootclasspath.

Otherwise, it adds the android.test.base library instead.

Bug: 30188076
Test: build, flash and test manually and with FrameworkCoreTests
Change-Id: I3c15c35724426a9cdeef398c5bc4f5176a8fc752
parent ebbbb5b1

target/product/base.mk

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ PRODUCT_PACKAGES += \ 
    appops \

    am \

    android.policy \

    android.test.base \

    android.test.mock \

    android.test.runner \

    app_process \
@@ -147,6 +148,12 @@ ifeq ($(REMOVE_OAHL_FROM_BCP),true) 
PRODUCT_PACKAGES += framework-oahl-backward-compatibility

endif



# Add the compatibility library that is needed when android.test.base

# is removed from the bootclasspath.

ifeq ($(REMOVE_ATB_FROM_BCP),true)

PRODUCT_PACKAGES += framework-atb-backward-compatibility

endif



# Essential HAL modules

PRODUCT_PACKAGES += \

    android.hardware.cas@1.0-service \

target/product/core_minimal.mk

+6 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ endif 
# The order of PRODUCT_BOOT_JARS matters.

PRODUCT_BOOT_JARS := \

    $(TARGET_CORE_JARS) \

    android.test.base \

    ext \

    framework \

    telephony-common \
@@ -125,6 +124,12 @@ else 
PRODUCT_BOOT_JARS += org.apache.http.legacy.boot

endif



ifeq ($(REMOVE_ATB_FROM_BCP),true)

PRODUCT_BOOT_JARS += framework-atb-backward-compatibility

else

PRODUCT_BOOT_JARS += android.test.base

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
@@ -94,7 +94,6 @@ endif 
# The order matters

PRODUCT_BOOT_JARS := \

    $(TARGET_CORE_JARS) \

    android.test.base \

    ext \

    framework \

    telephony-common \
@@ -109,6 +108,12 @@ else 
PRODUCT_BOOT_JARS += org.apache.http.legacy.boot

endif



ifeq ($(REMOVE_OAHL_FROM_BCP),true)

PRODUCT_BOOT_JARS += framework-atb-backward-compatibility

else

PRODUCT_BOOT_JARS += android.test.base

endif



# The order of PRODUCT_SYSTEM_SERVER_JARS matters.

PRODUCT_SYSTEM_SERVER_JARS := \

    services \