commit f81965bdc8c7d2f4fce350e59d392202b62ef573
author Benedict Wong <benedictwong@google.com> Sat Nov 23 03:45:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 23 03:45:53 2019 +0000
tree 4da50e925027badd397e0fc643e3037930d0c3b0
parent 9dda264619d76a756b8397d5e0138d0cacdb3171
parent 8ac6463155a7e26af4212c83e2b20752a97fabca

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

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 9cb7ad1..8f99446 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -51,6 +51,7 @@
     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 @@
     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