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
This commit is contained in:
Benedict Wong 2019-11-23 03:45:53 +00:00 committed by Gerrit Code Review
commit f81965bdc8
1 changed files with 4 additions and 1 deletions

View File

@ -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