From 2594c01fc184a7b9d21402aca92bec62e38ba62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Fri, 18 Sep 2026 20:24:43 +0800 Subject: [PATCH] Common: renames `androidApi.h` for `android/api.h` --- src/common/{androidApi.h => android/api.h} | 0 src/detection/battery/battery_android.c | 2 +- src/detection/camera/camera_android.c | 2 +- src/detection/codec/codec_android.c | 2 +- src/logo/image/aid.c | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/common/{androidApi.h => android/api.h} (100%) diff --git a/src/common/androidApi.h b/src/common/android/api.h similarity index 100% rename from src/common/androidApi.h rename to src/common/android/api.h diff --git a/src/detection/battery/battery_android.c b/src/detection/battery/battery_android.c index 37e938ef2..a99c773a0 100644 --- a/src/detection/battery/battery_android.c +++ b/src/detection/battery/battery_android.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "battery.h" -#include "common/androidApi.h" +#include "common/android/api.h" #include "common/android/binder.h" #include "common/processing.h" #include "common/properties.h" diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c index 5b3b1ccfd..abdbe3d9d 100644 --- a/src/detection/camera/camera_android.c +++ b/src/detection/camera/camera_android.c @@ -42,7 +42,7 @@ static void ffCameraMaxStreamSize(const ACameraMetadata* metadata, int32_t forma const char* ffDetectCamera(FFlist* result) { // The camera2 NDK and every entry point below were introduced in API 24, which is the API level // this build targets, so nothing here is newer than the minimum supported version and - // common/androidApi.h has nothing to guard. That header covers the opposite case: entry points + // common/android/api.h has nothing to guard. That header covers the opposite case: entry points // the NDK marks unavailable because they postdate the target, such as AImageDecoder (30) or // AMediaCodec_getName (28). It also only ever makes *symbols* weak -- libcamera2ndk.so itself is // API 24, so linking it unconditionally in CMakeLists.txt is fine on every supported device. diff --git a/src/detection/codec/codec_android.c b/src/detection/codec/codec_android.c index 54b39b9a6..b699dbb22 100644 --- a/src/detection/codec/codec_android.c +++ b/src/detection/codec/codec_android.c @@ -1,6 +1,6 @@ #include "codec.h" -#include "common/androidApi.h" +#include "common/android/api.h" #include "common/strutil.h" #include diff --git a/src/logo/image/aid.c b/src/logo/image/aid.c index 4e7ae343a..602aeac30 100644 --- a/src/logo/image/aid.c +++ b/src/logo/image/aid.c @@ -1,6 +1,6 @@ #include "image.h" -#include "common/androidApi.h" +#include "common/android/api.h" #include "common/io.h" #include "common/mallocHelper.h" @@ -122,7 +122,7 @@ FF_REQUIRES_API(30) static bool androidResolveDecoder(AImageDecoder* decoder, FF bool ffImageCreateAID(FFLogoRequestData* requestData, FFImageBuffer* out, const char** error) { // AImageDecoder is API 30, and fastfetch still runs on devices below that, so this is a real - // run-time check and not a compile-time constant. See common/androidApi.h for why. + // run-time check and not a compile-time constant. See common/android/api.h for why. if (FF_API_AT_LEAST(30)) { FF_AUTO_CLOSE_FD int fd = open(instance.config.logo.source.chars, O_RDONLY | O_CLOEXEC); if (fd < 0) {