pmt: migrate compiler version information completely to NDK base

This commit is contained in:
2024-10-03 22:05:03 +03:00
parent f88e9b013e
commit dfa55a7ea0
2 changed files with 2 additions and 18 deletions

View File

@@ -18,10 +18,8 @@
#pragma once
#ifdef __NDK_BUILD
#include <android/ndk-version.h>
#include <PartitionManager/generated/clang-version.h>
#endif
#include <android/ndk-version.h>
#include <PartitionManager/generated/clang-version.h>
#include <e2fsprogs/version.h>
/* versioning */

View File

@@ -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 */