From 6bcd4116cdfe4c0299ca8b4a94a4e44b6445dd49 Mon Sep 17 00:00:00 2001
From: Anton Ivanov <aii@google.com>
Date: Wed, 12 Mar 2025 10:42:34 -0700
Subject: Revert^2 "Explicitly include libgui as a shared library in
 libgui_test."

This reverts commit d6198bed29ffb56054490820e73ee30a718930d1.

Reason for revert: Removed flag defines from Android.bp that caused linker errors.  Verified libgui_test behaves identically with and without this revert on cf_x86_64_auto-next-userdebug

Change-Id: Ibbbd201253fa09c18491bffca0b540c2c13df8d3
---
 libs/gui/Android.bp       | 5 ++++-
 libs/gui/tests/Android.bp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index b5fa321fc2..158c54886d 100644
--- a/libs/gui/Android.bp
+++ b/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",
diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp
index e20345dd1a..308b2ab1c8 100644
--- a/libs/gui/tests/Android.bp
+++ b/libs/gui/tests/Android.bp
@@ -100,6 +100,7 @@ cc_test {
         "android.hardware.configstore-utils",
         "libSurfaceFlingerProp",
         "libGLESv1_CM",
+        "libgui",
         "libgui_test_server_aidl-cpp",
         "libinput",
         "libnativedisplay",
-- 
cgit v1.2.3-59-g8ed1b