Merge ef0b92541e6297fa4b3972a1a36b09aef59d3e40 on remote branch
Change-Id: I85a4dd6734ee11e212eceae3e5f334e4e44470a2
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.
diff --git a/apex/testing/test_apex_manifest.json b/apex/testing/test_apex_manifest.json
index 4b769f9..38a8de6 100644
--- a/apex/testing/test_apex_manifest.json
+++ b/apex/testing/test_apex_manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.ipsec",
- "version": 300000000
-}
\ No newline at end of file
+ "version": 2147483647
+}