From ad61fd80014fd9417de86a1d0f9304fec2511ff6 Mon Sep 17 00:00:00 2001 From: Tim Zimmermann Date: Sun, 29 Dec 2024 07:02:05 +0100 Subject: [PATCH] fingerprint: Use soong config instead of kernel headers * This way it also becomes usable for exynos devices. Change-Id: I56793fdb63bf6e2542caa1f6da68ba57ccf85b0e --- fingerprint/Android.bp | 7 ++++--- fingerprint/UdfpsExtension.cpp | 6 ------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp index 3ffc5d483..043f1b914 100644 --- a/fingerprint/Android.bp +++ b/fingerprint/Android.bp @@ -7,10 +7,11 @@ cc_library_static { name: "libudfps_extension.samsung", srcs: ["UdfpsExtension.cpp"], + cflags: select(soong_config_variable("samsung_udfps", "dimlayerzorder"), { + any @ zorder: ["-DFOD_PRESSED_LAYER_ZORDER=" + zorder], + default: [], + }), include_dirs: [ "frameworks/native/services/surfaceflinger/CompositionEngine/include", ], - header_libs: [ - "generated_kernel_headers", - ], } diff --git a/fingerprint/UdfpsExtension.cpp b/fingerprint/UdfpsExtension.cpp index aaacd9d05..1d344fde2 100644 --- a/fingerprint/UdfpsExtension.cpp +++ b/fingerprint/UdfpsExtension.cpp @@ -7,12 +7,6 @@ #include -#if __has_include() -#include -#elif __has_include() -#include -#endif - uint32_t getUdfpsDimZOrder(uint32_t z) { return z; }