Add ike-internals target as a placeholder
Added an empty ike-internals library that must be added to any target
that compiles ike-srcs. This is broken out as a separate change to
simplify the process of updating those affected targets by avoiding
having to make changes in frameworks/base, frameworks/opt/net/ike and
external/bouncycastle simultaneously in conflicting branches.
Bug: 152328618
Bug: 159008684
Test: m droid
atest FrameworksIkeTests
Change-Id: I98eea77a70eea6d78d06fbdeaf7997cdcbd2efd4
Merged-In: I98eea77a70eea6d78d06fbdeaf7997cdcbd2efd4
diff --git a/Android.bp b/Android.bp
index 587edde..61f21dc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,6 +26,10 @@
},
srcs: [":ike-srcs"],
+ static_libs: [
+ "ike-internals",
+ ],
+
libs: [
"unsupportedappusage",
"framework-annotations-lib",
@@ -65,11 +69,24 @@
path: "src/java/",
}
+// 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",
+ ],
+ 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.
