diff --git a/Android.bp b/Android.bp
index 92e63e9..afab551 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,25 +1,25 @@
 java_sdk_library {
     name: "pawlet-device",
-    srcs: ["core/java/**/*.java"],
     api_packages: ["pawletos.device"],
-
-    libs: [
-        "android_stubs_current",
-        "framework",
-    ],
-
+    api_dir: "api",
     sdk_version: "system_current",
     product_specific: true,
     installable: true,
-
-    api_dir: "api",
-
+    libs: ["android_stubs_current"],
     visibility: [
         "//frameworks/base/pawlet",
-        "//frameworks/base:__subpackages__",
         "//packages/apps:__subpackages__",
-        "//vendor:__subpackages__",
     ],
-
     unsafe_ignore_missing_latest_api: true,
+}
+
+java_library {
+    name: "pawlet-device-impl",
+    srcs: ["core/java/**/*.java"],
+    libs: ["framework-minus-apex"],
+    visibility: [
+        "//frameworks/base/pawlet",
+        "//packages/apps:__subpackages__",
+    ],
+    product_specific: true,
 }
\ No newline at end of file