diff options
| author | Alistair Delva <adelva@google.com> | 2022-07-14 13:33:32 -0700 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2022-07-14 13:33:36 -0700 |
| commit | 993cbfe654421a0d48f7afba21e0fcdd3fed5c8d (patch) | |
| tree | a91edca7f7eb13eeb977d7f3cabdee617dbf5971 | |
| parent | 77e1f764b56c2f8416d745412aed5ce61a47d29a (diff) | |
| download | crosvm-android11-gsi.tar.gz | |
Build fixes for wayland upgradeandroid11-gsi
crosvm.experimental is disabled for cuttlefish on this branch, but the
Android.bp files are still reachable, so we need to fix them up.
Bug: 216827224
Change-Id: I79bee55a7062cdba11640a074f0dbeea4500b569
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | gpu_display/Android.bp | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index d478c1608..f54821aaf 100644 --- a/Android.bp +++ b/Android.bp @@ -79,13 +79,13 @@ rust_binary_host { "libremain", ], shared_libs: [ + "libwayland_client", "libminijail", "libcap", ], static_libs: [ "libusb", "libdisplay_wl", - "libwayland_client", "libffi", "libfdt", ], diff --git a/gpu_display/Android.bp b/gpu_display/Android.bp index 17a16f467..4dd09ae64 100644 --- a/gpu_display/Android.bp +++ b/gpu_display/Android.bp @@ -28,7 +28,14 @@ cc_library_host_static { generated_headers: ["gpu_display_client_protocol_headers"], export_generated_headers: ["gpu_display_client_protocol_headers"], - static_libs: ["libwayland_client"], + shared_libs: ["libwayland_client"], + + target: { + linux_glibc_x86: { + // libffi broken on x86, see b/162610242 + enabled: false, + }, + }, } wayland_protocol_codegen { |