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

Commit f81965bd authored by Benedict Wong's avatar Benedict Wong Committed by Gerrit Code Review
Browse files

Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" 

* changes:
  Add ike.jar to bootclasspath to expose IKE API
  Add com.android.ipsec APEX to base makefile
parents 9dda2646 8ac64631

target/product/base_system.mk

+4 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \ 
    com.android.apex.cts.shim.v1_prebuilt \

    com.android.conscrypt \

    com.android.i18n \

    com.android.ipsec \

    com.android.location.provider \

    com.android.media \

    com.android.media.swcodec \
@@ -321,10 +322,12 @@ PRODUCT_BOOT_JARS := \ 
    telephony-common \

    voip-common \

    ims-common \

    ike \

    updatable-media

PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt updatable-media

PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt ike updatable-media

PRODUCT_UPDATABLE_BOOT_LOCATIONS := \

    /apex/com.android.conscrypt/javalib/conscrypt.jar \

    /apex/com.android.ipsec/javalib/ike.jar \

    /apex/com.android.media/javalib/updatable-media.jar