Snap for 10453563 from 15117f717033e13d4ef850a80d22cc1c4f7ac514 to mainline-art-releaseaml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060android14-mainline-art-release

Change-Id: If5f534af2ddfb21bd2f2331350baaa96b7432968

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