diff --git a/Android.bp b/Android.bp
index 596524f..ca79126 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,7 +5,7 @@ java_sdk_library {
     sdk_version: "system_current",
     product_specific: true,
     installable: true,
-    api_dir: "api",
+    api_dir: "api/device",
     visibility: [
         "//packages/apps:__subpackages__",
         "//vendor:__subpackages__",
@@ -20,10 +20,10 @@ java_sdk_library {
     sdk_version: "system_current",
     product_specific: true,
     installable: true,
-    api_dir: "api",
+    api_dir: "api/system",
     visibility: [
+        "//frameworks/base:__subpackages__",
         "//packages/apps:__subpackages__",
-        "//vendor:__subpackages__",
     ],
     unsafe_ignore_missing_latest_api: true,
-}
+}
\ No newline at end of file