From e705c8b5e606de939f34adccd493aabb219f944f Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Fri, 2 Dec 2016 11:15:15 +0000 Subject: Replace __ANDROID_NDK__ with __ANDROID__ Summary: This replaces all the uses of the __ANDROID_NDK__ define with __ANDROID__. This is a preparatory step to remove our custom android toolchain file and rely on the standard android NDK one instead, which does not provide this define. Instead I rely, on __ANDROID__, which is set by the compiler. I haven't yet removed the cmake variable with the same name, as we will need to do something completely different there -- NDK toolchain defines CMAKE_SYSTEM_NAME to Android, while our current one pretends it's linux. Reviewers: tberghammer, zturner Subscribers: danalbert, srhines, mgorny, lldb-commits Differential Revision: https://reviews.llvm.org/D27305 llvm-svn: 288494 --- lldb/source/Host/posix/HostInfoPosix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lldb/source/Host/posix/HostInfoPosix.cpp') diff --git a/lldb/source/Host/posix/HostInfoPosix.cpp b/lldb/source/Host/posix/HostInfoPosix.cpp index 689928cd38f..38aac59ecc4 100644 --- a/lldb/source/Host/posix/HostInfoPosix.cpp +++ b/lldb/source/Host/posix/HostInfoPosix.cpp @@ -48,7 +48,7 @@ bool HostInfoPosix::GetHostname(std::string &s) { return false; } -#ifdef __ANDROID_NDK__ +#ifdef __ANDROID__ #include #endif #if defined(__ANDROID_API__) && __ANDROID_API__ < 21 -- cgit v1.2.3