drm_hwcomposer: fixing aospless tarball The current tarball seems to be missing some includes for libdisplay-info, this probably happened when trying to resolve some clank incompatibilities. Overall the aospless flow should probably be more robust/less error prone. Change-Id: I35d785470440132bcff75baac089efdac3be849f signed-off-by: Lucas Berthou <berlu@google.com>
diff --git a/.ci/Dockerfile b/.ci/Dockerfile index a9e2242..9e35a0b 100644 --- a/.ci/Dockerfile +++ b/.ci/Dockerfile
@@ -41,10 +41,10 @@ USER ${RUN_USER} # Install aospless package (produced by GloDroid/aospext) -RUN wget -P ${USER_HOME} https://gitlab.freedesktop.org/-/project/5/uploads/97f99b51143107ba02a51cf1c0ddb542/aospless_drm_hwcomposer_arm64.tar.xz && \ +RUN wget -P ${USER_HOME} https://gitlab.freedesktop.org/-/project/5/uploads/fc5d1db3b2acfd4de41b86fead784ebe/aospless_drm_hwcomposer_arm64.tar.xz && \ cd ${USER_HOME} && \ sha256sum aospless_drm_hwcomposer_arm64.tar.xz && \ - (echo dae29adb121f51e59c95fb7b29e0f7aed5b2983d10c7f1d5f1b9fd551c4bbb47 aospless_drm_hwcomposer_arm64.tar.xz | sha256sum --check) && \ + (echo 0a1004ddad9ba3b6435cd6b8805a96d002c6ac92231df8054e0ef7e385d7997a aospless_drm_hwcomposer_arm64.tar.xz | sha256sum --check) && \ tar xf aospless_drm_hwcomposer_arm64.tar.xz && ln -s ../drm_hwcomposer/ ${USER_HOME}/aospless/src # Create project path
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f3d022..a28139c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml
@@ -26,12 +26,13 @@ - cd .. - rm -f aospless_drm_hwcomposer_arm64.tar.xz - rm -rf aospless/* - - wget https://gitlab.freedesktop.org/-/project/5/uploads/97f99b51143107ba02a51cf1c0ddb542/aospless_drm_hwcomposer_arm64.tar.xz + - wget https://gitlab.freedesktop.org/-/project/5/uploads/fc5d1db3b2acfd4de41b86fead784ebe/aospless_drm_hwcomposer_arm64.tar.xz - tar xf aospless_drm_hwcomposer_arm64.tar.xz - rm -rf aospless/src - ln -s ../drm-hwcomposer/ aospless/src - make -C ./aospless install - cp -r aospless/install/* drm-hwcomposer/install/arm64 + - ls drm-hwcomposer/install/arm64 artifacts: paths: @@ -44,7 +45,7 @@ - cd .. - rm -f aospless_drm_hwcomposer_arm64.tar.xz - rm -rf aospless/* - - wget https://gitlab.freedesktop.org/-/project/5/uploads/97f99b51143107ba02a51cf1c0ddb542/aospless_drm_hwcomposer_arm64.tar.xz + - wget https://gitlab.freedesktop.org/-/project/5/uploads/fc5d1db3b2acfd4de41b86fead784ebe/aospless_drm_hwcomposer_arm64.tar.xz - tar xf aospless_drm_hwcomposer_arm64.tar.xz - cd - - make -j$(nproc) -k -f .ci/Makefile