diff options
| author | 2025-03-18 08:10:38 -0700 | |
|---|---|---|
| committer | 2025-03-18 08:10:38 -0700 | |
| commit | 4b5277998b867b95bd340c09f0c137dc9738f006 (patch) | |
| tree | e22c61ee7bd6e3f7ea23cca6f449ddd6c5e1a34b /libs | |
| parent | 70802315f75a3ae4de21a6c52eaffabeb44ab397 (diff) | |
| parent | 6bcd4116cdfe4c0299ca8b4a94a4e44b6445dd49 (diff) | |
Merge "Revert^2 "Explicitly include libgui as a shared library in libgui_test."" into main
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gui/Android.bp | 5 | ||||
| -rw-r--r-- | libs/gui/tests/Android.bp | 1 |
2 files changed, 5 insertions, 1 deletions
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 64f81c7d93..bd53031e79 100644 --- a/libs/gui/tests/Android.bp +++ b/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", |