Snap for 10453563 from 15117f717033e13d4ef850a80d22cc1c4f7ac514 to mainline-conscrypt-releaseaml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000android14-mainline-conscrypt-release

Change-Id: I177a5c5822b3ea97142192ee395bf694f8cd9c0b

1 files changed, 2 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index dd28bc7..b3709e0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -83,7 +83,7 @@ genrule {
     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 @@ genrule {
     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 @@ cc_library_host_shared {
     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