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

Commit a4ba5872 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android (Google) Code Review
Browse files

Merge "Add support for dualbooting dalvik and art"

parents 3ba9cb24 3d0507d3

target/product/dalvikvm.mk

+9 −2
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ 


ifeq ($(WITH_ART),false)

    PRODUCT_PACKAGES += \

        core \

        libdvm \

        dexopt

else

    PRODUCT_PACKAGES += \

        core-libart \

        libart \

        dex2oat

    PRODUCT_PROPERTY_OVERRIDES += \
@@ -33,7 +35,6 @@ PRODUCT_PACKAGES += \ 
    bouncycastle \

    cacerts \

    conscrypt \

    core \

    core-junit \

    dalvikvm \

    dexdeps \
@@ -56,11 +57,17 @@ PRODUCT_PACKAGES += \ 


# host-only dependencies

ifeq ($(WITH_HOST_DALVIK),true)

    ifeq ($(WITH_ART),false)

        PRODUCT_PACKAGES += \

            core-hostdex

    else

        PRODUCT_PACKAGES += \

            core-libart-hostdex

    endif

    PRODUCT_PACKAGES += \

        apache-xml-hostdex \

        bouncycastle-hostdex \

        conscrypt-hostdex \

        core-hostdex \

        dalvik \

        libcrypto-host \

        libexpat-host \