commit 76f8bfc32789f806a0ccf82f2e1b74d6fc2934e2
author android-build-team Robot <android-build-team-robot@google.com> Tue Jun 30 01:03:04 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 30 01:03:04 2020 +0000
tree 963cfabe3d4c98475a84cc323d2d73dfe32b27d7
parent 916136b19a85b3a0ee5ab7badb508467dac885b8
parent ea6eaf8cd5cc94d32f766e9289001f0db7b95604

Snap for 6639787 from ea6eaf8cd5cc94d32f766e9289001f0db7b95604 to rvc-release

Change-Id: I8b5a756d50c2e27b4b2d793dee32a64104443814

Android.bp

diff --git a/Android.bp b/Android.bp
index 587edde..1eea393 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,10 @@
     },
     srcs: [":ike-srcs"],
 
+    static_libs: [
+        "ike-internals",
+    ],
+
     libs: [
         "unsupportedappusage",
         "framework-annotations-lib",
@@ -54,7 +58,6 @@
     name: "ike-srcs",
     srcs: [
         "src/java/**/*.java",
-        ":bouncycastle_ike_digests",
         ":framework-ike-shared-srcs",
     ],
 }
@@ -65,11 +68,23 @@
     path: "src/java/",
 }
 
+// Provides internal classes needed to build the ike sources.
+java_library {
+    name: "ike-internals",
+    apex_available: [
+        "com.android.ipsec",
+        "test_com.android.ipsec",
+    ],
+    static_libs: ["bouncycastle_ike_digests"],
+    sdk_version: "core_current",
+}
+
 java_library {
     name: "ike_test",
     installable: false, // Used only for testing; never installed alone.
     srcs: [":ike-srcs"],
     libs: ["unsupportedappusage"],
+    static_libs: ["ike-internals"],
 
     // Shared filegroups of BouncyCastle and frameworks are jar-jar'ed to avoid
     // being overwritten by the frameworks class copies.