From b6ba817de4b80ec2430383899b051e86dd2bec27 Mon Sep 17 00:00:00 2001 From: dimitry Date: Wed, 23 Aug 2017 10:25:22 +0200 Subject: Define current ABI string in android-base/macros.h Test: make Change-Id: I8200d7b3232edba43a583c5ff1e1b0f78c768f69 --- libmemunreachable/MemUnreachable.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'libmemunreachable') diff --git a/libmemunreachable/MemUnreachable.cpp b/libmemunreachable/MemUnreachable.cpp index 5e062fde7..24fdc7f37 100644 --- a/libmemunreachable/MemUnreachable.cpp +++ b/libmemunreachable/MemUnreachable.cpp @@ -479,23 +479,6 @@ std::string Leak::ToString(bool log_contents) const { return oss.str(); } -// Figure out the abi based on defined macros. -#if defined(__arm__) -#define ABI_STRING "arm" -#elif defined(__aarch64__) -#define ABI_STRING "arm64" -#elif defined(__mips__) && !defined(__LP64__) -#define ABI_STRING "mips" -#elif defined(__mips__) && defined(__LP64__) -#define ABI_STRING "mips64" -#elif defined(__i386__) -#define ABI_STRING "x86" -#elif defined(__x86_64__) -#define ABI_STRING "x86_64" -#else -#error "Unsupported ABI" -#endif - std::string UnreachableMemoryInfo::ToString(bool log_contents) const { std::ostringstream oss; oss << " " << leak_bytes << " bytes in "; -- cgit v1.2.3