commit 6bcd4116cdfe4c0299ca8b4a94a4e44b6445dd49
author Anton Ivanov <aii@google.com> Wed Mar 12 10:42:34 2025 -0700
committer Anton Ivanov <aii@google.com> Mon Mar 17 17:11:18 2025 -0700
tree 99331ec32bc03dfa0a0b927dc952e88e236cb7ba
parent d6198bed29ffb56054490820e73ee30a718930d1

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

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index b5fa321..158c548 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -295,7 +295,6 @@
 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 @@
         "libgui-defaults",
     ],
 
+    srcs: [
+        ":libgui-sources",
+    ],
+
     export_static_lib_headers: [
         "libgui_aidl_static",
         "libgui_window_info_static",