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:
@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
|
|||||||
com.android.apex.cts.shim.v1_prebuilt \
|
com.android.apex.cts.shim.v1_prebuilt \
|
||||||
com.android.conscrypt \
|
com.android.conscrypt \
|
||||||
com.android.i18n \
|
com.android.i18n \
|
||||||
|
com.android.ipsec \
|
||||||
com.android.location.provider \
|
com.android.location.provider \
|
||||||
com.android.media \
|
com.android.media \
|
||||||
com.android.media.swcodec \
|
com.android.media.swcodec \
|
||||||
@@ -321,10 +322,12 @@ PRODUCT_BOOT_JARS := \
|
|||||||
telephony-common \
|
telephony-common \
|
||||||
voip-common \
|
voip-common \
|
||||||
ims-common \
|
ims-common \
|
||||||
|
ike \
|
||||||
updatable-media
|
updatable-media
|
||||||
PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt updatable-media
|
PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt ike updatable-media
|
||||||
PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
|
PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
|
||||||
/apex/com.android.conscrypt/javalib/conscrypt.jar \
|
/apex/com.android.conscrypt/javalib/conscrypt.jar \
|
||||||
|
/apex/com.android.ipsec/javalib/ike.jar \
|
||||||
/apex/com.android.media/javalib/updatable-media.jar
|
/apex/com.android.media/javalib/updatable-media.jar
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user