diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 9ef0eac..1fd79b7 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -308,9 +308,9 @@
     ],
 }
 
-cc_library_shared {
-    name: "libgui",
-    vendor_available: true,
+cc_defaults {
+    name: "libgui_defaults",
+
     double_loadable: true,
 
     defaults: [
@@ -506,4 +506,16 @@
     ],
 }
 
+cc_library_shared {
+    name: "libgui",
+    vendor_available: true,
+    defaults: ["libgui_defaults"]
+}
+
+cc_library_shared {
+    name: "libgui_vendor",
+    vendor: true,
+    defaults: ["libgui_defaults"]
+}
+
 subdirs = ["tests"]