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

am: f81965bdc8

Change-Id: Ica29d14159e4bdf0b330322493531834106a2c76
This commit is contained in:
Benedict Wong 2019-11-22 20:10:09 -08:00 committed by android-build-merger
commit 97239f3c3e

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