drm_hwcomposer: CI: Move aospless flags to meson.build

Currently __ANDROID_API__ is defined by adding it directly to the
aospless cross-configuration file. But aospless is designed to use the
meson.build files in drm-hwcomposer, so put the flag in there instead.
This aligns better with the proper use of aospless.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>

.ci/build-arm64.sh

@@ -7,6 +7,9 @@ source "./.ci/setup-test-env.sh"
 
 section_start build_drmhwc_arm64 "build_drmhwc_arm64"
 set -x
+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
 mkdir -p "${CI_PROJECT_DIR}/install/arm64"

.ci/build-x86_64.sh

@@ -7,6 +7,9 @@ source "./.ci/setup-test-env.sh"
 
 section_start build_drmhwc_x86_64 "build_drmhwc_x86_64"
 set -x
+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
 mkdir -p "${CI_PROJECT_DIR}/install/x86_64"

.ci/container/ubuntu/x86_64_aospless.sh

@@ -82,11 +82,13 @@ 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
 
 git clone https://github.com/GloDroid/aospext.git
-sed -i "s|cpp_args = \['\[CPP_ARGS\]'\]|cpp_args = ['[CPP_ARGS]', '-D__ANDROID_API__=${ANDROID_SDK_VERSION}']|" "${TOP}/aospext/tools/meson_aosp_cross.cfg"
+
 cat >> "${TOP}/device/google/cuttlefish/shared/device.mk" <<EOF
 BOARD_BUILD_AOSPEXT_DRMHWCOMPOSER := true
 BOARD_DRMHWCOMPOSER_SRC_DIR := external/drm_hwcomposer