diff options
| author | Jason Macnak <natsu@google.com> | 2021-06-29 10:43:13 -0700 |
|---|---|---|
| committer | Jason Macnak <natsu@google.com> | 2021-07-07 12:18:13 -0700 |
| commit | 979fcb747a2a1ea5c36ec8e71aef321ca24741e0 (patch) | |
| tree | 8fb3a2efe9ebdb5cb7b93b06a685ecaafc29c941 | |
| parent | b5d1bc4e9fdace419ab7f44ecb5d39d4734d38fc (diff) | |
| download | platform_external_crosvm-android-s-beta-4.tar.gz platform_external_crosvm-android-s-beta-4.tar.bz2 platform_external_crosvm-android-s-beta-4.zip | |
Update gpu_display build for new Wayland extensionandroid-s-beta-4android-s-beta-3android-s-beta-4
... so that Wayland compositors (Cuttlefish's streaming server)
can exactly associate Wayland surfaces with scanouts/displays
Bug: b/188904670
Test: launch_cvd
Test: launch_cvd --gpu_mode=gfxstream
Change-Id: I6f8ad9a965e87e39749bea163338327c32f1e6b1
| -rw-r--r-- | gpu_display/Android.bp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/gpu_display/Android.bp b/gpu_display/Android.bp index e30f6619..97049708 100644 --- a/gpu_display/Android.bp +++ b/gpu_display/Android.bp @@ -95,6 +95,7 @@ wayland_protocol_codegen { "protocol/aura-shell.xml", "protocol/linux-dmabuf-unstable-v1.xml", "protocol/viewporter.xml", + "protocol/virtio-gpu-metadata-v1.xml", ], tools: ["wayland_scanner"], } @@ -107,10 +108,41 @@ wayland_protocol_codegen { "protocol/aura-shell.xml", "protocol/linux-dmabuf-unstable-v1.xml", "protocol/viewporter.xml", + "protocol/virtio-gpu-metadata-v1.xml", ], tools: ["wayland_scanner"], } +wayland_protocol_codegen { + name: "gpu_display_server_protocol_headers", + cmd: "$(location wayland_scanner) server-header < $(in) > $(out)", + suffix: ".h", + srcs: [ + "protocol/aura-shell.xml", + "protocol/linux-dmabuf-unstable-v1.xml", + "protocol/viewporter.xml", + "protocol/virtio-gpu-metadata-v1.xml", + ], + tools: ["wayland_scanner"], +} + +cc_library_static { + name: "libwayland_crosvm_gpu_display_extension_server_protocols", + vendor_available: true, + host_supported: true, + cflags: [ + "-Wall", + "-Wextra", + "-Werror", + "-g", + "-fvisibility=hidden", + ], + static_libs: ["libwayland_server"], + generated_sources: ["gpu_display_protocol_sources"], + generated_headers: ["gpu_display_server_protocol_headers"], + export_generated_headers: ["gpu_display_server_protocol_headers"], +} + // dependent_library ["feature_list"] // ../assertions/src/lib.rs // ../base/src/lib.rs |