diff --git a/Android.bp b/Android.bp
index 8eb4e98..596524f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,11 +13,17 @@ java_sdk_library {
     unsafe_ignore_missing_latest_api: true,
 }
 
-android_library {
-    name: "pawlet-system-internal",
+java_sdk_library {
+    name: "pawlet-system",
     srcs: ["core/java/pawletos/device/PawletSystem.java"],
-    sdk_version: "current",
-    static_libs: ["android_stubs_current"],
+    api_packages: ["pawletos.device.system"],
+    sdk_version: "system_current",
     product_specific: true,
-    visibility: ["//visibility:public"],
-}
\ No newline at end of file
+    installable: true,
+    api_dir: "api",
+    visibility: [
+        "//packages/apps:__subpackages__",
+        "//vendor:__subpackages__",
+    ],
+    unsafe_ignore_missing_latest_api: true,
+}