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

drm_hwcomposer: CI: Update to Android 16

Browse source 
In preparation for rebuilding all CI containers to use Android 16,
update CI/build variables to use Android 16 and Android SDK 36.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
This commit is contained in:
Deborah Brouwer 2025-08-14 16:34:35 -07:00
parent 3312d98b61
commit ea5689b295
8 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.ci/Makefile
View file

@ -7,11 +7,12 @@ CLANG := clang++-19
CLANG_TIDY := clang-tidy-19 CLANG_TIDY := clang-tidy-19
OUT_DIR := /tmp/drm_hwcomposer/build OUT_DIR := /tmp/drm_hwcomposer/build
SRC_DIR := . SRC_DIR := .
ANDROID_SDK_VERSION ?= 36
CXXFLAGS := -Wall -Wextra -Werror -Wno-missing-designated-field-initializers CXXFLAGS := -Wall -Wextra -Werror -Wno-missing-designated-field-initializers
CXXFLAGS += -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -Wthread-safety CXXFLAGS += -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS -Wthread-safety
CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++17 -DHWC2_USE_CPP11 -DHWC2_INCLUDE_STRINGIFICATION -fno-rtti CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++17 -DHWC2_USE_CPP11 -DHWC2_INCLUDE_STRINGIFICATION -fno-rtti
CXXFLAGS += --target=aarch64-linux-android35 CXXFLAGS += --target=aarch64-linux-android$(ANDROID_SDK_VERSION)
CXXARGS := $(shell cat $(BASE_DIR)/toolchain_wrapper/sharedlib.cppflags) CXXARGS := $(shell cat $(BASE_DIR)/toolchain_wrapper/sharedlib.cppflags)
CXXARGS := $(subst [BASE_DIR],$(BASE_DIR),$(CXXARGS)) CXXARGS := $(subst [BASE_DIR],$(BASE_DIR),$(CXXARGS))

2
.ci/build-arm64.sh
View file

@ -6,8 +6,6 @@ set -e
source "${FDO_CI_BASH_HELPERS}" source "${FDO_CI_BASH_HELPERS}"
fdo_log_section_start_collapsed build_drmhwc_arm64 "build_drmhwc_arm64" fdo_log_section_start_collapsed build_drmhwc_arm64 "build_drmhwc_arm64"
sed -i "/'-DUSE_IMAPPER4_METADATA_API'/a\ '-D__ANDROID_API__=${ANDROID_SDK_VERSION}'," \
"${CI_PROJECT_DIR}/meson.build"
ln -s "${CI_PROJECT_DIR}" "/aospless_arm64/src" ln -s "${CI_PROJECT_DIR}" "/aospless_arm64/src"
make -C /aospless_arm64 install make -C /aospless_arm64 install

2
.ci/build-x86_64.sh
View file

@ -6,8 +6,6 @@ set -e
source "${FDO_CI_BASH_HELPERS}" source "${FDO_CI_BASH_HELPERS}"
fdo_log_section_start_collapsed build_drmhwc_x86_64 "build_drmhwc_x86_64" fdo_log_section_start_collapsed build_drmhwc_x86_64 "build_drmhwc_x86_64"
sed -i "/'-DUSE_IMAPPER4_METADATA_API'/a\ '-D__ANDROID_API__=${ANDROID_SDK_VERSION}'," \
"${CI_PROJECT_DIR}/meson.build"
ln -s "${CI_PROJECT_DIR}" "/aospless_x86_64/src" ln -s "${CI_PROJECT_DIR}" "/aospless_x86_64/src"
make -C /aospless_x86_64 install make -C /aospless_x86_64 install

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

@ -79,8 +79,6 @@ else
fi fi
git -C external/drm_hwcomposer checkout FETCH_HEAD git -C external/drm_hwcomposer checkout FETCH_HEAD
sed -i "/'-DUSE_IMAPPER4_METADATA_API'/a\ '-D__ANDROID_API__=${ANDROID_SDK_VERSION}'," external/drm_hwcomposer/meson.build
rm external/libdisplay_info -rf rm external/libdisplay_info -rf
git clone --depth=1 https://android.googlesource.com/platform/external/libdisplay-info/ external/libdisplay_info git clone --depth=1 https://android.googlesource.com/platform/external/libdisplay-info/ external/libdisplay_info

4
.gitlab-ci.yml
View file

@ -5,8 +5,8 @@ workflow:
- when: always - when: always
variables: variables:
ANDROID_BRANCH: android15-release ANDROID_BRANCH: android16-release
ANDROID_SDK_VERSION: 35 ANDROID_SDK_VERSION: 36
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
CI_TEMPLATES_COMMIT: &ci-templates-commit 32afe5644697e503af18a736587c8619fa036a72 CI_TEMPLATES_COMMIT: &ci-templates-commit 32afe5644697e503af18a736587c8619fa036a72
FDO_UPSTREAM_REPO: "drm-hwcomposer/drm-hwcomposer" FDO_UPSTREAM_REPO: "drm-hwcomposer/drm-hwcomposer"

2
hwc3/hwc3-drm.xml
View file

@ -1,7 +1,7 @@
<manifest version="1.0" type="device"> <manifest version="1.0" type="device">
<hal format="aidl"> <hal format="aidl">
<name>android.hardware.graphics.composer3</name> <name>android.hardware.graphics.composer3</name>
<version>3</version> <version>4</version>
<interface> <interface>
<name>IComposer</name> <name>IComposer</name>
<instance>default</instance> <instance>default</instance>

4
meson.build
View file

@ -46,8 +46,12 @@ deps = [
dependency('android.hardware.graphics.composer@2.2-resources'), dependency('android.hardware.graphics.composer@2.2-resources'),
] ]
android_sdk_version = get_option('android_sdk_version')
message('ANDROID_SDK_VERSION = ' + android_sdk_version)
common_cpp_flags = [ common_cpp_flags = [
'-DUSE_IMAPPER4_METADATA_API', '-DUSE_IMAPPER4_METADATA_API',
'-D__ANDROID_API__=' + android_sdk_version,
] ]
dep_libdisplay_info = dependency('display_info', required : false) dep_libdisplay_info = dependency('display_info', required : false)

1
meson.options Normal file
View file

@ -0,0 +1 @@
option('android_sdk_version', type : 'string', value : '36')