From dfa55a7ea0f681ac017d736099397717a31fc02a Mon Sep 17 00:00:00 2001 From: YZBruh Date: Thu, 3 Oct 2024 22:05:03 +0300 Subject: [PATCH] pmt: migrate compiler version information completely to NDK base --- include/PartitionManager/VersionFnVars.h | 6 ++---- jni/PartitionManager/Version.cpp | 14 -------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/include/PartitionManager/VersionFnVars.h b/include/PartitionManager/VersionFnVars.h index f07b00e..58f9dfe 100755 --- a/include/PartitionManager/VersionFnVars.h +++ b/include/PartitionManager/VersionFnVars.h @@ -18,10 +18,8 @@ #pragma once -#ifdef __NDK_BUILD - #include - #include -#endif +#include +#include #include /* versioning */ diff --git a/jni/PartitionManager/Version.cpp b/jni/PartitionManager/Version.cpp index 10cb1be..f2c4c97 100755 --- a/jni/PartitionManager/Version.cpp +++ b/jni/PartitionManager/Version.cpp @@ -57,21 +57,7 @@ void Functions::DisplayVersion(void) E2FSPROGS_VERSION_PRIVATE, EXT2FS_LIB_VERSION_PRIVATE, E2FSPROGS_DATE); - - VLOGD("DisplayVersion: build type: "); - - if (Booleans::VerboseMode) -#if defined(__clang__) && !defined(__NDK_BUILD) - printf("clang (manual).\n"); - LOGD("pmt %s: clang %d.%d.%d\n", - Display::UsingDispString->compiler_str, - __clang_major__, - __clang_minor__, - __clang_patchlevel__); -#elif defined(__NDK_BUILD) - printf("NDK.\n"); LOGD("\n%s\n", __NDK_CXX_VERSION__); -#endif } /* end of code */