commit 090d1eecb67f2974b90f3c6f0b5e139754aa5d49
author Yan Yan <evitayan@google.com> Mon Jun 29 21:02:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 29 21:02:40 2020 +0000
tree 963cfabe3d4c98475a84cc323d2d73dfe32b27d7
parent 36feb4e8065639244566db14d57d7f010e045030
parent ea6eaf8cd5cc94d32f766e9289001f0db7b95604

Merge changes from topic "bouncycastle_ike_digests" into rvc-dev am: ea6eaf8cd5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IPsec/+/11989964

Change-Id: I52e5c5c8b3b35ea15388d396b383c1bf330fca6a

Android.bp

diff --git a/Android.bp b/Android.bp
index 61f21dc..1eea393 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,7 +58,6 @@
     name: "ike-srcs",
     srcs: [
         "src/java/**/*.java",
-        ":bouncycastle_ike_digests",
         ":framework-ike-shared-srcs",
     ],
 }
@@ -70,14 +69,13 @@
 }
 
 // Provides internal classes needed to build the ike sources.
-//
-// TODO(b/152328618) - Add dependency on bouncycastle_ike_digests code.
 java_library {
     name: "ike-internals",
     apex_available: [
         "com.android.ipsec",
         "test_com.android.ipsec",
     ],
+    static_libs: ["bouncycastle_ike_digests"],
     sdk_version: "core_current",
 }