commit 6d5046f0fc0a8880f49ee19ca22920d7baa838fc
author Liana Kazanova (xWF) <lkazanova@google.com> Tue Mar 11 14:14:58 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 11 14:14:58 2025 -0700
tree 46922b82389cb42078e9c14276acbf9fe40ee8a7
parent 2e6071117a048dafe2eeb03d59d2b6adec371c35
parent d6198bed29ffb56054490820e73ee30a718930d1

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

libs/gui/Android.bp

diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp
index 158c548..b5fa321 100644
--- a/libs/gui/Android.bp
+++ b/libs/gui/Android.bp
@@ -295,6 +295,7 @@
 cc_defaults {
     name: "libgui-defaults",
     defaults: ["libgui_bufferqueue-defaults"],
+    srcs: [":libgui-sources"],
     static_libs: [
         "libgui_aidl_static",
         "libgui_window_info_static",
@@ -318,10 +319,6 @@
         "libgui-defaults",
     ],
 
-    srcs: [
-        ":libgui-sources",
-    ],
-
     export_static_lib_headers: [
         "libgui_aidl_static",
         "libgui_window_info_static",

libs/gui/tests/Android.bp

diff --git a/libs/gui/tests/Android.bp b/libs/gui/tests/Android.bp
index 308b2ab..e20345d 100644
--- a/libs/gui/tests/Android.bp
+++ b/libs/gui/tests/Android.bp
@@ -100,7 +100,6 @@
         "android.hardware.configstore-utils",
         "libSurfaceFlingerProp",
         "libGLESv1_CM",
-        "libgui",
         "libgui_test_server_aidl-cpp",
         "libinput",
         "libnativedisplay",