From 3e1e5c2fedfe6f3afe6a4508b638c9bc513e79f4 Mon Sep 17 00:00:00 2001
From: Deborah Brouwer <deborah.brouwer@collabora.com>
Date: Wed, 9 Apr 2025 12:34:55 -0700
Subject: [PATCH] drm_hwcomposer: CI: Add new job to build for x86_64

Use the aospless x86_64 tarball to build drm-hwcomposer binaries for
x86_64 architecture. These binaries will be used subsequently to run the
cts and vts tests.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
---
 .ci/build-x86_64.sh | 15 +++++++++++++++
 .gitlab-ci.yml      | 11 +++++++++++
 2 files changed, 26 insertions(+)
 create mode 100755 .ci/build-x86_64.sh

diff --git a/.ci/build-x86_64.sh b/.ci/build-x86_64.sh
new file mode 100755
index 0000000..1874717
--- /dev/null
+++ b/.ci/build-x86_64.sh
@@ -0,0 +1,15 @@
+#! /usr/bin/env bash
+# shellcheck disable=SC1091 # no need to follow references to other shell scripts
+
+set -e
+
+source "./.ci/setup-test-env.sh"
+
+section_start build_drmhwc_x86_64 "build_drmhwc_x86_64"
+set -x
+ln -s "${CI_PROJECT_DIR}" "/aospless_x86_64/src"
+make -C /aospless_x86_64 install
+mkdir -p "${CI_PROJECT_DIR}/install/x86_64"
+cp -r /aospless_x86_64/install/* "${CI_PROJECT_DIR}/install/x86_64"
+set +x
+section_end build_drmhwc_arm64
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b890992..adba8f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,6 +34,17 @@ build_arm64:
       - "${CI_PROJECT_DIR}/install/arm64"
     expire_in: 1 week
 
+build_x86_64:
+  stage: build
+  extends:
+    .use-ubuntu/x86_64_aospless
+  script:
+    "${CI_PROJECT_DIR}/.ci/build-x86_64.sh"
+  artifacts:
+    paths:
+      - "${CI_PROJECT_DIR}/install/x86_64"
+    expire_in: 1 week
+
 tidy:
   stage: tidy
   extends: