lineage-rockchip/android_external_drm_hwcomposer
1
0
Fork 0
Code Activity Actions

drm_hwcomposer: CI: aospless: Use Android 16

Browse source 
Update the aospless container to work with the Android 16 repositories.
This ensures that aospless can still be used to build drm-hwcomposer
binaries for Android 16.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
This commit is contained in:
Deborah Brouwer 2025-08-08 16:58:34 -07:00
parent 5d47be1918
commit abdb5fa5b8
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

43
.ci/container/ubuntu/x86_64_aospless.sh
View file

@ -68,19 +68,20 @@ yes n | repo init \
-b "${ANDROID_BRANCH}" \
--depth=1
time repo sync --fail-fast --no-tags -j2
fdo_log_section_end repo_init
rm external/drm_hwcomposer -rf
fdo_log_section_start_collapsed customize_repo "customize_repo"
DRMHWC_DIR="${TOP}/external/drm_hwcomposer"
git clone "${CI_REPOSITORY_URL}" external/drm_hwcomposer
rm "${DRMHWC_DIR}" -rf
git clone "${CI_REPOSITORY_URL}" "${DRMHWC_DIR}"
if [[ "${CI_PIPELINE_SOURCE}" == "merge_request_event" ]]; then
git -C external/drm_hwcomposer fetch origin "${CI_MERGE_REQUEST_REF_PATH}"
git -C "${DRMHWC_DIR}" fetch origin "${CI_MERGE_REQUEST_REF_PATH}"
else
git -C external/drm_hwcomposer fetch origin "${CI_COMMIT_REF_NAME}"
git -C "${DRMHWC_DIR}" fetch origin "${CI_COMMIT_REF_NAME}"
fi
git -C external/drm_hwcomposer checkout FETCH_HEAD
rm external/libdisplay_info -rf
git clone --depth=1 https://android.googlesource.com/platform/external/libdisplay-info/ external/libdisplay_info
git -C "${DRMHWC_DIR}" checkout FETCH_HEAD
git clone https://github.com/GloDroid/aospext.git
@ -88,21 +89,37 @@ cat >> "${TOP}/device/google/cuttlefish/shared/device.mk" <<EOF
BOARD_BUILD_AOSPEXT_DRMHWCOMPOSER := true
BOARD_DRMHWCOMPOSER_SRC_DIR := external/drm_hwcomposer
EOF
source build/envsetup.sh
fdo_log_section_end repo_init
ALLOW_MK_x86_64="${TOP}/device/google/cuttlefish/vsoc_x86_64_only/phone/aosp_cf.mk"
sed -i '/^PRODUCT_ALLOWED_ANDROIDMK_FILES := art\/Android.mk$/ s|$| aospext/Android.mk aospext/**/Android.mk|' \
"${ALLOW_MK_x86_64}"
ALLOW_MK_arm64="${TOP}/device/google/cuttlefish/vsoc_arm64_only/phone/aosp_cf.mk"
sed -i '/^PRODUCT_ALLOWED_ANDROIDMK_FILES := art\/Android.mk$/ s|$| aospext/Android.mk aospext/**/Android.mk|' \
"${ALLOW_MK_arm64}"
fdo_log_section_end customize_repo
fdo_log_section_start_collapsed build_aospless_x86_64 "build_aospless_x86_64"
source build/envsetup.sh
cd "${TOP}/aospext"
export TARGET_BUILD_VARIANT=userdebug # needed for adb root and remount
export TARGET_PRODUCT=aosp_cf_x86_64_slim
export TARGET_RELEASE=trunk_staging
export TARGET_RELEASE=bp2a
# Disable LLVM Link-Time-Optimization so that the aospless artifacts will
# have full object files for linking rather than raw bitcode
export DISABLE_LTO=true
lunch "${TARGET_PRODUCT}-${TARGET_RELEASE}-${TARGET_BUILD_VARIANT}"
mm
cd "${TOP}/out/target/product/vsoc_x86_64_only/obj/AOSPEXT/DRMHWCOMPOSER/"
make gen_aospless
tar --no-same-owner -xf aospless.tar.gz
# Rename and move the artifacts needed for subsequent jobs to the root directory
cp -r "./aospless" "/aospless_x86_64"
cp -r "${TOP}/out/target/product/vsoc_x86_64_only/obj/AOSPEXT/DRMHWCOMPOSER/aospless" \
"/aospless_x86_64"
fdo_log_section_end build_aospless_x86_64
@ -110,7 +127,7 @@ fdo_log_section_start_collapsed build_aospless_arm64 "build_aospless_arm64"
cd "${TOP}/aospext"
export TARGET_BUILD_VARIANT=userdebug # needed for adb root and remount
export TARGET_PRODUCT=aosp_cf_arm64_slim
export TARGET_RELEASE=trunk_staging
export TARGET_RELEASE=bp2a
lunch "${TARGET_PRODUCT}-${TARGET_RELEASE}-${TARGET_BUILD_VARIANT}"
mm
cd "${TOP}/out/target/product/vsoc_arm64_only/obj/AOSPEXT/DRMHWCOMPOSER/"