diff --git a/Android.bp b/Android.bp
index f48e6fe..7ffd6be 100644
--- a/Android.bp
+++ b/Android.bp
@@ -470,7 +470,7 @@
         "framework-sdkextensions-stubs-systemapi",
         "framework-statsd", // TODO(b/146167933): Use framework-statsd-stubs
         "framework-permission-stubs-systemapi",
-        "framework-wifi-stubs",
+        "framework-wifi-stubs-systemapi",
         "ike-stubs",
     ],
     installable: true,
@@ -524,7 +524,7 @@
         "framework-sdkextensions-stubs-systemapi",
         // TODO(b/146167933): Use framework-statsd-stubs instead.
         "framework-statsd",
-        "framework-wifi-stubs",
+        "framework-wifi-stubs-systemapi",
         "ike-stubs",
         // TODO(b/147200698): should be the stub of framework-tethering
         "framework-tethering",
diff --git a/wifi/Android.bp b/wifi/Android.bp
index dae04c6..e55971e 100644
--- a/wifi/Android.bp
+++ b/wifi/Android.bp
@@ -132,27 +132,70 @@
     ],
 }
 
-droidstubs {
-    name: "framework-wifi-stubs-srcs",
-    srcs: [
-        ":framework-annotations",
-        ":framework-wifi-updatable-sources",
-    ],
+stubs_defaults {
+    name: "framework-wifi-stubs-srcs-defaults",
     // This is needed as IOnWifiActivityEnergyInfoListener.aidl in framework-wifi depends on
     // WifiActivityEnergyInfo.aidl in framework-minus-apex
     aidl: {
         include_dirs: ["frameworks/base/core/java"],
     },
-    defaults: [ "framework-module-stubs-defaults-systemapi" ],
-    sdk_version: "core_current",
-    libs: ["android_system_stubs_current"],
+    srcs: [ ":framework-wifi-updatable-sources" ],
+    libs: [ "framework-annotations-lib" ],
+    sdk_version: "system_current",
+}
+
+droidstubs {
+    name: "framework-wifi-stubs-srcs-publicapi",
+    defaults: [
+        "framework-module-stubs-defaults-publicapi",
+        "framework-wifi-stubs-srcs-defaults",
+    ],
+}
+
+droidstubs {
+    name: "framework-wifi-stubs-srcs-systemapi",
+    defaults: [
+        "framework-module-stubs-defaults-systemapi",
+        "framework-wifi-stubs-srcs-defaults",
+    ],
+}
+
+droidstubs {
+    name: "framework-wifi-api-module_libs_api",
+    defaults: [
+        "framework-module-api-defaults-module_libs_api",
+        "framework-wifi-stubs-srcs-defaults",
+    ],
+}
+
+droidstubs {
+    name: "framework-wifi-stubs-srcs-module_libs_api",
+    defaults: [
+        "framework-module-stubs-defaults-module_libs_api",
+        "framework-wifi-stubs-srcs-defaults",
+    ],
 }
 
 java_library {
-    name: "framework-wifi-stubs",
-    srcs: [":framework-wifi-stubs-srcs"],
-    sdk_version: "core_current",
-    libs: ["android_system_stubs_current"],
+    name: "framework-wifi-stubs-publicapi",
+    srcs: [":framework-wifi-stubs-srcs-publicapi"],
+    sdk_version: "current",
+    installable: false,
+}
+
+java_library {
+    name: "framework-wifi-stubs-systemapi",
+    srcs: [":framework-wifi-stubs-srcs-systemapi"],
+    sdk_version: "system_current",
+    libs: ["framework-annotations-lib"],
+    installable: false,
+}
+
+java_library {
+    name: "framework-wifi-stubs-module_libs_api",
+    srcs: [":framework-wifi-stubs-srcs-module_libs_api"],
+    sdk_version: "system_current",
+    libs: ["framework-annotations-lib"],
     installable: false,
 }