diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 966cef13b0..9a9a6f1d98 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -30,12 +30,8 @@ cc_library_headers {
     min_sdk_version: "29",
 }
 
-cc_library_shared {
-    name: "libgui",
-    vendor_available: false,
-    vndk: {
-        enabled: true,
-    },
+cc_defaults {
+    name: "libgui_defaults",
     double_loadable: true,
 
     defaults: ["libgui_bufferqueue-defaults"],
@@ -273,4 +269,19 @@ cc_library_static {
     ],
 }
 
+cc_library_shared {
+    name: "libgui",
+    vendor_available: false,
+    vndk: {
+        enabled: true,
+    },
+    defaults: ["libgui_defaults"]
+}
+
+cc_library_shared {
+    name: "libgui_vendor",
+    vendor: true,
+    defaults: ["libgui_defaults"]
+}
+
 subdirs = ["tests"]