Merge "Revert^2 "Explicitly include libgui as a shared library in libgui_test."" into main

Author: Treehugger Robot

libs/gui/Android.bp

@@ -295,7 +295,6 @@ filegroup {
 cc_defaults {
     name: "libgui-defaults",
     defaults: ["libgui_bufferqueue-defaults"],
-    srcs: [":libgui-sources"],
     static_libs: [
         "libgui_aidl_static",
         "libgui_window_info_static",
@@ -319,6 +318,10 @@ cc_library_shared {
         "libgui-defaults",
     ],
 
+    srcs: [
+        ":libgui-sources",
+    ],
+
     export_static_lib_headers: [
         "libgui_aidl_static",
         "libgui_window_info_static",

libs/gui/tests/Android.bp

@@ -95,6 +95,7 @@ cc_test {
         "android.hardware.configstore-utils",
         "libSurfaceFlingerProp",
         "libGLESv1_CM",
+        "libgui",
         "libgui_test_server_aidl-cpp",
         "libinput",
         "libnativedisplay",