From ea5689b295081fb1167ff75f040b281a87227582 Mon Sep 17 00:00:00 2001 From: Deborah Brouwer Date: Thu, 14 Aug 2025 16:34:35 -0700 Subject: [PATCH] drm_hwcomposer: CI: Update to Android 16 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 --- .ci/Makefile | 3 ++- .ci/build-arm64.sh | 2 -- .ci/build-x86_64.sh | 2 -- .ci/container/ubuntu/x86_64_aospless.sh | 2 -- .gitlab-ci.yml | 4 ++-- hwc3/hwc3-drm.xml | 2 +- meson.build | 4 ++++ meson.options | 1 + 8 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 meson.options diff --git a/.ci/Makefile b/.ci/Makefile index 79dcc94..ff39ff7 100644 --- a/.ci/Makefile +++ b/.ci/Makefile @@ -7,11 +7,12 @@ CLANG := clang++-19 CLANG_TIDY := clang-tidy-19 OUT_DIR := /tmp/drm_hwcomposer/build SRC_DIR := . +ANDROID_SDK_VERSION ?= 36 CXXFLAGS := -Wall -Wextra -Werror -Wno-missing-designated-field-initializers 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 += --target=aarch64-linux-android35 +CXXFLAGS += --target=aarch64-linux-android$(ANDROID_SDK_VERSION) CXXARGS := $(shell cat $(BASE_DIR)/toolchain_wrapper/sharedlib.cppflags) CXXARGS := $(subst [BASE_DIR],$(BASE_DIR),$(CXXARGS)) diff --git a/.ci/build-arm64.sh b/.ci/build-arm64.sh index 7427aaa..7daa21c 100755 --- a/.ci/build-arm64.sh +++ b/.ci/build-arm64.sh @@ -6,8 +6,6 @@ set -e source "${FDO_CI_BASH_HELPERS}" 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" make -C /aospless_arm64 install diff --git a/.ci/build-x86_64.sh b/.ci/build-x86_64.sh index 5c963c4..c142761 100755 --- a/.ci/build-x86_64.sh +++ b/.ci/build-x86_64.sh @@ -6,8 +6,6 @@ set -e source "${FDO_CI_BASH_HELPERS}" 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" make -C /aospless_x86_64 install diff --git a/.ci/container/ubuntu/x86_64_aospless.sh b/.ci/container/ubuntu/x86_64_aospless.sh index bd46470..0931534 100755 --- a/.ci/container/ubuntu/x86_64_aospless.sh +++ b/.ci/container/ubuntu/x86_64_aospless.sh @@ -79,8 +79,6 @@ else fi 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 git clone --depth=1 https://android.googlesource.com/platform/external/libdisplay-info/ external/libdisplay_info diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81ac581..944b84e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,8 +5,8 @@ workflow: - when: always variables: - ANDROID_BRANCH: android15-release - ANDROID_SDK_VERSION: 35 + ANDROID_BRANCH: android16-release + ANDROID_SDK_VERSION: 36 DEBIAN_FRONTEND: noninteractive CI_TEMPLATES_COMMIT: &ci-templates-commit 32afe5644697e503af18a736587c8619fa036a72 FDO_UPSTREAM_REPO: "drm-hwcomposer/drm-hwcomposer" diff --git a/hwc3/hwc3-drm.xml b/hwc3/hwc3-drm.xml index 911f7f8..7debcf9 100644 --- a/hwc3/hwc3-drm.xml +++ b/hwc3/hwc3-drm.xml @@ -1,7 +1,7 @@ android.hardware.graphics.composer3 - 3 + 4 IComposer default diff --git a/meson.build b/meson.build index 16b4121..99203a2 100644 --- a/meson.build +++ b/meson.build @@ -46,8 +46,12 @@ deps = [ 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 = [ '-DUSE_IMAPPER4_METADATA_API', + '-D__ANDROID_API__=' + android_sdk_version, ] dep_libdisplay_info = dependency('display_info', required : false) diff --git a/meson.options b/meson.options new file mode 100644 index 0000000..68037a8 --- /dev/null +++ b/meson.options @@ -0,0 +1 @@ +option('android_sdk_version', type : 'string', value : '36')