Enabled module_lib in android.net.ipsec.ike

Test: m update-api
Bug: 155164730
Change-Id: I24d37c52b0c42bcc19948e8472cc0e76e94e2fe0
Merged-In: I24d37c52b0c42bcc19948e8472cc0e76e94e2fe0
(cherry picked from 15c4fed09b09b745603cb63090ff6a2bd3a9fdcb)

1 files changed, 3 insertions, 33 deletions

diff --git a/Android.bp b/Android.bp
index f954c1cb..74450672 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,8 +14,8 @@
 
 java_sdk_library {
     name: "android.net.ipsec.ike",
+    defaults: ["framework-module-defaults"],
     installable: true,
-    sdk_version: "module_current",
 
     aidl: {
         local_include_dirs: ["src/java"],
@@ -28,7 +28,6 @@ java_sdk_library {
 
     libs: [
         "unsupportedappusage",
-        "framework-annotations-lib",
     ],
 
     api_packages: [
@@ -41,13 +40,13 @@ java_sdk_library {
     // being overwritten by the frameworks class copies.
     jarjar_rules: "jarjar-rules-shared.txt",
 
-    plugins: ["java_api_finder"],
-
     hostdex: true, // for hiddenapi check
     apex_available: [
         "com.android.ipsec",
         "test_com.android.ipsec",
     ],
+
+    stubs_library_visibility: ["//visibility:public"],
 }
 
 filegroup {
@@ -86,32 +85,3 @@ java_library {
     // being overwritten by the frameworks class copies.
     jarjar_rules: "jarjar-rules-shared.txt",
 }
-
-stubs_defaults {
-    name: "ike-stubs-defaults",
-    srcs: [":ike-api-srcs"],
-}
-
-droidstubs {
-    name: "android.net.ipsec.ike.api.sources.module_libs_api",
-    defaults: [
-        "framework-module-api-defaults-module_libs_api",
-        "ike-stubs-defaults",
-    ],
-    dist: { dest: "android.net.ipsec.ike.txt" },
-}
-
-droidstubs {
-    name: "android.net.ipsec.ike.stubs.sources.module_libs_api",
-    defaults: [
-        "framework-module-stubs-defaults-module_libs_api",
-        "ike-stubs-defaults",
-    ],
-}
-
-java_library {
-    name: "android.net.ipsec.ike.stubs.module_libs_api",
-    srcs: [":android.net.ipsec.ike.stubs.sources.module_libs_api"],
-    defaults: ["framework-module-stubs-lib-defaults-module_libs_api"],
-    dist: { dest: "android.net.ipsec.ike.jar" },
-}