diff --git a/Android.bp b/Android.bp
index 3113d4d..9266942 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,13 +1,25 @@
+java_sdk_library {
+    name: "pawlet-device-system",
+    srcs: ["core/java/pawletos/device/PawletDevice.java"],
+    api_packages: ["pawletos.device"],
+    sdk_version: "system_current",
+    product_specific: true,
+    installable: true,
+    api_dir: "api",
+    visibility: [
+        "//packages/apps:__subpackages__",
+        "//vendor:__subpackages__",
+    ],
+    unsafe_ignore_missing_latest_api: true,
+}
+
 android_library {
     name: "pawlet-device",
     srcs: ["core/java/pawletos/device/PawletDevice.java"],
     manifest: "AndroidManifest.xml",
     sdk_version: "current",
-    product_specific: true,
     static_libs: ["android_stubs_current"],
+    product_specific: false,
     aaptflags: ["--skip-symbols-without-default-localization"],
-    visibility: [
-        "//packages/apps:__subpackages__",
-        "//vendor:__subpackages__",
-    ],
+    visibility: ["//visibility:public"],
 }
\ No newline at end of file