commit ee957c89d0f8131688e606783f6e34fdba065e3f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:54:27 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 04:54:27 2023 +0000
tree 3a4592f0d8090ce5007a5fabd9518f641ce7fb21
parent ca9eb27cb0176e8d42ffcc0ee0b3646483e34e58
parent 15117f717033e13d4ef850a80d22cc1c4f7ac514

Snap for 10453563 from 15117f717033e13d4ef850a80d22cc1c4f7ac514 to mainline-documentsui-release

Change-Id: Idc309e3864830728a0a7db4cc6bebc40df0d35c3

Android.bp

diff --git a/Android.bp b/Android.bp
index dd28bc7..b3709e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,7 +83,7 @@
     name: "wayland_core_protocol_sources_static",
     cmd: "$(location wayland_scanner) -s private-code < $(in) > $(out)",
     srcs: [":wayland_core_protocol"],
-    out: ["wayland-protocol.c"],
+    out: ["wayland-protocol-private.c"],
     tools: ["wayland_scanner"],
 }
 
@@ -92,7 +92,7 @@
     name: "wayland_core_protocol_sources_shared",
     cmd: "$(location wayland_scanner) -s public-code < $(in) > $(out)",
     srcs: [":wayland_core_protocol"],
-    out: ["wayland-protocol.c"],
+    out: ["wayland-protocol-public.c"],
     tools: ["wayland_scanner"],
 }
 
@@ -148,12 +148,6 @@
     name: "libwayland_client",
     defaults: ["libwayland_client_defaults"],
     generated_sources: ["wayland_core_protocol_sources_shared"],
-    target: {
-        linux_glibc_x86: {
-            // libffi broken on x86, see b/162610242
-            enabled: false,
-        },
-    },
 }
 
 // Build wayland_server