commit 6e5c82eae6ed3525cd353943c7d29028b96cc720
author Roman Stratiienko <r.stratiienko@gmail.com> Wed Oct 16 23:05:25 2024 +0300
committer Roman Stratiienko <r.stratiienko@gmail.com> Thu Oct 17 02:13:20 2024 +0300
tree f62cff8df003ed28273f0299b32180beba35d604
parent 57ba08add77c58e9cbfdbec3c72b87d074cd4685

drm_hwcomposer: CI: Properly upgrade drm_hwc aospless file

In the previous version, build flags pointed to Android API v33, while
headers were from Android API v35. This caused issues when using
"if __ANDROID_API__ >= 35" preprocessor macros.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>

.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d710113..b045da8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,11 +26,11 @@
     - cd ..
     - rm -f aospless_drm_hwcomposer_arm64.tar.xz
     - rm -rf aospless/*
-    - wget https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/uploads/28ef9379b1a0ec1ee19a17825b0f3f3f/aospless_drm_hwcomposer_arm64.tar.xz
+    - wget https://gitlab.freedesktop.org/-/project/5/uploads/70643bd1c4d419015b9930b7aadc9cfd/aospless_drm_hwcomposer_arm64.tar.xz
     - tar xf aospless_drm_hwcomposer_arm64.tar.xz
-    - rm -r aospless/src
+    - rm -rf aospless/src
     - ln -s ../drm-hwcomposer/ aospless/src
-    - make -C ./aospless all
+    - make -C ./aospless install
     - cp -r aospless/install/* drm-hwcomposer/install/arm64
 
   artifacts:
@@ -44,7 +44,7 @@
     - cd ..
     - rm -f aospless_drm_hwcomposer_arm64.tar.xz
     - rm -rf aospless/*
-    - wget https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/uploads/28ef9379b1a0ec1ee19a17825b0f3f3f/aospless_drm_hwcomposer_arm64.tar.xz
+    - wget https://gitlab.freedesktop.org/-/project/5/uploads/70643bd1c4d419015b9930b7aadc9cfd/aospless_drm_hwcomposer_arm64.tar.xz
     - tar xf aospless_drm_hwcomposer_arm64.tar.xz
     - cd -
     - make -j$(nproc) -k -f .ci/Makefile