diff options
| author | Wen Chang Liu <wenchangliu@google.com> | 2022-05-12 12:16:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-12 12:16:26 +0000 |
| commit | c610c173203b8ac3982a50f5b054e8ab385adb5a (patch) | |
| tree | aa3177902465b79841ba8aff0d9b598eec563e3e | |
| parent | cbc8a1480cfb2dc69b5da436a27c10d7f28adcf5 (diff) | |
| parent | e2bd023cf67c6ffbef640df9329b280a1e428843 (diff) | |
| download | gchips-c610c173203b8ac3982a50f5b054e8ab385adb5a.tar.gz | |
Merge "use UAPI for SBWC size macros from videodev2_exynos_media.h" into tm-d1-dev am: e2bd023cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/gchips/+/18231554
Change-Id: Iddc0a8badec7b76caf4a3c88adacb948ffba3659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | GrallocHAL/src/core/exynos_format_allocation.h | 4 | ||||
| -rw-r--r-- | gralloc4/src/core/exynos_format_allocation.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/GrallocHAL/src/core/exynos_format_allocation.h b/GrallocHAL/src/core/exynos_format_allocation.h index 30b2c15..204ed98 100644 --- a/GrallocHAL/src/core/exynos_format_allocation.h +++ b/GrallocHAL/src/core/exynos_format_allocation.h @@ -16,8 +16,8 @@ #pragma once -#if __has_include(<video/mfc_macros.h>) -#include <video/mfc_macros.h> +#if __has_include(<linux/videodev2_exynos_media.h>) +#include <linux/videodev2_exynos_media.h> #else #include "mfc_macros_local.h" #endif diff --git a/gralloc4/src/core/exynos_format_allocation.h b/gralloc4/src/core/exynos_format_allocation.h index bcaadfb..0abfbd0 100644 --- a/gralloc4/src/core/exynos_format_allocation.h +++ b/gralloc4/src/core/exynos_format_allocation.h @@ -16,8 +16,8 @@ #pragma once -#if __has_include(<video/mfc_macros.h>) -#include <video/mfc_macros.h> +#if __has_include(<linux/videodev2_exynos_media.h>) +#include <linux/videodev2_exynos_media.h> #else #include "mfc_macros_local.h" #endif |