diff options
author | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-03-09 21:56:50 +0200 |
---|---|---|
committer | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-04-06 12:12:17 +0300 |
commit | d21071f7d5eaa8385fac8eabee73c17d2868775d (patch) | |
tree | f8bb981801ab2d880c92a47e2f5c0e61cbfbb1b4 /bufferinfo | |
parent | 6a7ac12a2fdd6e82ed6f4e64899236794363ac06 (diff) | |
download | drm_hwcomposer-d21071f7d5eaa8385fac8eabee73c17d2868775d.tar.gz |
drm_hwcomposer: CI: Increase coverage
Add the following files to the build:
backend/BackendClient.cpp
backend/Backend.cpp
backend/BackendManager.cpp
backend/BackendRCarDu.cpp
bufferinfo/legacy/BufferInfoImagination.cpp
bufferinfo/legacy/BufferInfoLibdrm.cpp
bufferinfo/legacy/BufferInfoMaliHisi.cpp
bufferinfo/legacy/BufferInfoMaliMediatek.cpp
bufferinfo/legacy/BufferInfoMaliMeson.cpp
bufferinfo/legacy/BufferInfoMinigbm.cpp
compositor/DrmDisplayComposition.cpp
compositor/DrmDisplayCompositor.cpp
compositor/Planner.cpp
drm/DrmGenericImporter.cpp
DrmHwcTwo.cpp
drm/ResourceManager.cpp
drm/VSyncWorker.cpp
tests/worker_test.cpp
utils/autolock.cpp
Files 'bufferinfo/BufferInfoMapperMetadata.cpp' and 'utils/hwcutils.cpp' require
a lot of additional headers, therefore move them out of the scope of this commit.
'utils/gralloc.h' isn't planned to use in pure-linux builds, therefore remove
it from 'utils' and put it into '.ci/android_headers/hardware/'
Fix minor tidy fails.
Fix linux build fails (missing includes) due to differences between libc and
bionic.
Comment-out some sections in 'tests/test_include' which aren't used by drm_hwc
but causing build failures for CI due to missing dependencies.
Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Matvii Zorin <matvii.zorin@globallogic.com>
Diffstat (limited to 'bufferinfo')
-rw-r--r-- | bufferinfo/BufferInfoGetter.h | 2 | ||||
-rw-r--r-- | bufferinfo/BufferInfoMapperMetadata.cpp | 3 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoImagination.cpp | 2 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoLibdrm.cpp | 5 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoMaliHisi.cpp | 4 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoMaliMediatek.cpp | 4 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoMaliMeson.cpp | 4 | ||||
-rw-r--r-- | bufferinfo/legacy/BufferInfoMinigbm.cpp | 2 |
8 files changed, 14 insertions, 12 deletions
diff --git a/bufferinfo/BufferInfoGetter.h b/bufferinfo/BufferInfoGetter.h index c1dc74a..60ca985 100644 --- a/bufferinfo/BufferInfoGetter.h +++ b/bufferinfo/BufferInfoGetter.h @@ -18,10 +18,10 @@ #define ANDROID_BUFFERINFOGETTER_H_ #include <drm/drm_fourcc.h> +#include <hardware/gralloc.h> #include "drm/DrmDevice.h" #include "drmhwcgralloc.h" -#include "utils/gralloc.h" #ifndef DRM_FORMAT_INVALID #define DRM_FORMAT_INVALID 0 diff --git a/bufferinfo/BufferInfoMapperMetadata.cpp b/bufferinfo/BufferInfoMapperMetadata.cpp index 516c7e1..23a9072 100644 --- a/bufferinfo/BufferInfoMapperMetadata.cpp +++ b/bufferinfo/BufferInfoMapperMetadata.cpp @@ -21,13 +21,14 @@ #include "BufferInfoMapperMetadata.h" #include <drm/drm_fourcc.h> -#include <log/log.h> #include <ui/GraphicBufferMapper.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <cinttypes> +#include "utils/log.h" + namespace android { BufferInfoGetter *BufferInfoMapperMetadata::CreateInstance() { diff --git a/bufferinfo/legacy/BufferInfoImagination.cpp b/bufferinfo/legacy/BufferInfoImagination.cpp index b3c1d33..d646072 100644 --- a/bufferinfo/legacy/BufferInfoImagination.cpp +++ b/bufferinfo/legacy/BufferInfoImagination.cpp @@ -18,10 +18,10 @@ #include "BufferInfoImagination.h" -#include <log/log.h> #include <xf86drm.h> #include "img_gralloc1_public.h" +#include "utils/log.h" namespace android { diff --git a/bufferinfo/legacy/BufferInfoLibdrm.cpp b/bufferinfo/legacy/BufferInfoLibdrm.cpp index 1953e36..52f792f 100644 --- a/bufferinfo/legacy/BufferInfoLibdrm.cpp +++ b/bufferinfo/legacy/BufferInfoLibdrm.cpp @@ -18,13 +18,14 @@ #include "BufferInfoLibdrm.h" -#include <cutils/properties.h> #include <gralloc_handle.h> #include <hardware/gralloc.h> -#include <log/log.h> #include <xf86drm.h> #include <xf86drmMode.h> +#include "utils/log.h" +#include "utils/properties.h" + namespace android { LEGACY_BUFFER_INFO_GETTER(BufferInfoLibdrm); diff --git a/bufferinfo/legacy/BufferInfoMaliHisi.cpp b/bufferinfo/legacy/BufferInfoMaliHisi.cpp index ddb12ab..5fc413a 100644 --- a/bufferinfo/legacy/BufferInfoMaliHisi.cpp +++ b/bufferinfo/legacy/BufferInfoMaliHisi.cpp @@ -18,13 +18,13 @@ #include "BufferInfoMaliHisi.h" -#include <log/log.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <cinttypes> #include "gralloc_priv.h" +#include "utils/log.h" #define MALI_ALIGN(value, base) (((value) + ((base)-1)) & ~((base)-1)) @@ -70,7 +70,7 @@ int BufferInfoMaliHisi::ConvertBoInfo(buffer_handle_t handle, hwc_drm_bo_t *bo) { bool is_rgb = false; - auto *hnd = (private_handle_t const *)handle; + const auto *hnd = (private_handle_t const *)handle; if (!hnd) return -EINVAL; diff --git a/bufferinfo/legacy/BufferInfoMaliMediatek.cpp b/bufferinfo/legacy/BufferInfoMaliMediatek.cpp index f6e0ac5..7e6f3a8 100644 --- a/bufferinfo/legacy/BufferInfoMaliMediatek.cpp +++ b/bufferinfo/legacy/BufferInfoMaliMediatek.cpp @@ -19,7 +19,6 @@ #include "BufferInfoMaliMediatek.h" #include <hardware/gralloc.h> -#include <log/log.h> #include <stdatomic.h> #include <xf86drm.h> #include <xf86drmMode.h> @@ -27,6 +26,7 @@ #include <cinttypes> #include "gralloc_priv.h" +#include "utils/log.h" namespace android { @@ -34,7 +34,7 @@ LEGACY_BUFFER_INFO_GETTER(BufferInfoMaliMediatek); int BufferInfoMaliMediatek::ConvertBoInfo(buffer_handle_t handle, hwc_drm_bo_t *bo) { - auto *hnd = (private_handle_t const *)handle; + const auto *hnd = (private_handle_t const *)handle; if (!hnd) return -EINVAL; diff --git a/bufferinfo/legacy/BufferInfoMaliMeson.cpp b/bufferinfo/legacy/BufferInfoMaliMeson.cpp index ad10203..9daf542 100644 --- a/bufferinfo/legacy/BufferInfoMaliMeson.cpp +++ b/bufferinfo/legacy/BufferInfoMaliMeson.cpp @@ -18,13 +18,13 @@ #include "BufferInfoMaliMeson.h" -#include <log/log.h> #include <xf86drm.h> #include <xf86drmMode.h> #include <cinttypes> #include "gralloc_priv.h" +#include "utils/log.h" namespace android { @@ -63,7 +63,7 @@ uint64_t BufferInfoMaliMeson::ConvertGrallocFormatToDrmModifiers( int BufferInfoMaliMeson::ConvertBoInfo(buffer_handle_t handle, hwc_drm_bo_t *bo) { - auto *hnd = (private_handle_t const *)handle; + const auto *hnd = (private_handle_t const *)handle; if (!hnd) return -EINVAL; diff --git a/bufferinfo/legacy/BufferInfoMinigbm.cpp b/bufferinfo/legacy/BufferInfoMinigbm.cpp index f5e661f..d030dff 100644 --- a/bufferinfo/legacy/BufferInfoMinigbm.cpp +++ b/bufferinfo/legacy/BufferInfoMinigbm.cpp @@ -18,11 +18,11 @@ #include "BufferInfoMinigbm.h" -#include <log/log.h> #include <xf86drm.h> #include <xf86drmMode.h> #include "cros_gralloc_handle.h" +#include "utils/log.h" #define DRM_FORMAT_YVU420_ANDROID fourcc_code('9', '9', '9', '7') |