[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-02 Thread Pavel Labath via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL288494: Replace __ANDROID_NDK__ with __ANDROID__ (authored 
by labath).

Changed prior to commit:
  https://reviews.llvm.org/D27305?vs=80047=80048#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D27305

Files:
  lldb/trunk/cmake/platforms/Android.cmake
  lldb/trunk/include/lldb/Core/RegularExpression.h
  lldb/trunk/include/lldb/Host/Config.h
  lldb/trunk/include/lldb/Host/Editline.h
  lldb/trunk/include/lldb/Host/Host.h
  lldb/trunk/include/lldb/Host/HostInfo.h
  lldb/trunk/include/lldb/Host/Time.h
  lldb/trunk/include/lldb/Host/linux/Personality.h
  lldb/trunk/include/lldb/Host/posix/Fcntl.h
  lldb/trunk/source/Host/common/Host.cpp
  lldb/trunk/source/Host/common/Socket.cpp
  lldb/trunk/source/Host/linux/ProcessLauncherLinux.cpp
  lldb/trunk/source/Host/posix/HostInfoPosix.cpp
  lldb/trunk/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
  
lldb/trunk/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
  
lldb/trunk/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
  lldb/trunk/source/Utility/PseudoTerminal.cpp
  lldb/trunk/tools/driver/Driver.cpp

Index: lldb/trunk/cmake/platforms/Android.cmake
===
--- lldb/trunk/cmake/platforms/Android.cmake
+++ lldb/trunk/cmake/platforms/Android.cmake
@@ -33,8 +33,7 @@
 include( CMakeForceCompiler )
 
 # flags and definitions
-remove_definitions( -DANDROID -D__ANDROID__ )
-add_definitions( -DANDROID -D__ANDROID_NDK__ -DLLDB_DISABLE_LIBEDIT )
+add_definitions( -DANDROID -DLLDB_DISABLE_LIBEDIT )
 set( ANDROID True )
 set( __ANDROID_NDK__ True )
 set( LLDB_DEFAULT_DISABLE_LIBEDIT True )
Index: lldb/trunk/source/Host/common/Socket.cpp
===
--- lldb/trunk/source/Host/common/Socket.cpp
+++ lldb/trunk/source/Host/common/Socket.cpp
@@ -33,7 +33,7 @@
 #include "lldb/Host/linux/AbstractSocket.h"
 #endif
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #include 
 #include 
@@ -44,7 +44,7 @@
 #include 
 #include 
 #endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC
-#endif // __ANDROID_NDK__
+#endif // __ANDROID__
 
 using namespace lldb;
 using namespace lldb_private;
Index: lldb/trunk/source/Host/common/Host.cpp
===
--- lldb/trunk/source/Host/common/Host.cpp
+++ lldb/trunk/source/Host/common/Host.cpp
@@ -29,7 +29,7 @@
 
 #if defined(__linux__) || defined(__FreeBSD__) ||  \
 defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
-#if !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
+#if !defined(__ANDROID__)
 #include 
 #endif
 #include 
@@ -320,7 +320,7 @@
   return thread_self;
 #elif defined(__FreeBSD__)
   return lldb::tid_t(pthread_getthreadid_np());
-#elif defined(__ANDROID_NDK__)
+#elif defined(__ANDROID__)
   return lldb::tid_t(gettid());
 #elif defined(__linux__)
   return lldb::tid_t(syscall(SYS_gettid));
@@ -454,7 +454,7 @@
 
 FileSpec Host::GetModuleFileSpecForHostAddress(const void *host_addr) {
   FileSpec module_filespec;
-#if !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
+#if !defined(__ANDROID__)
   Dl_info info;
   if (::dladdr(host_addr, )) {
 if (info.dli_fname)
@@ -622,7 +622,7 @@
 
 #if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) ||\
 defined(__GLIBC__) || defined(__NetBSD__)
-#if !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
+#if !defined(__ANDROID__)
 // this method needs to be visible to macosx/Host.cpp and
 // common/Host.cpp.
 
@@ -956,7 +956,7 @@
   }
   return error.Success();
 }
-#endif // !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
+#endif // !defined(__ANDROID__)
 #endif // defined (__APPLE__) || defined (__linux__) || defined (__FreeBSD__) ||
// defined (__GLIBC__) || defined(__NetBSD__)
 
Index: lldb/trunk/source/Host/posix/HostInfoPosix.cpp
===
--- lldb/trunk/source/Host/posix/HostInfoPosix.cpp
+++ lldb/trunk/source/Host/posix/HostInfoPosix.cpp
@@ -48,7 +48,7 @@
   return false;
 }
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #endif
 #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
Index: lldb/trunk/source/Host/linux/ProcessLauncherLinux.cpp
===
--- lldb/trunk/source/Host/linux/ProcessLauncherLinux.cpp
+++ lldb/trunk/source/Host/linux/ProcessLauncherLinux.cpp
@@ -26,7 +26,7 @@
 using namespace lldb_private;
 
 static void FixupEnvironment(Args ) {
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
   // If there is no PATH variable specified inside the environment then set the
   // path to /system/bin. It is required because the default path used by
   // execve() is wrong on android.
Index: lldb/trunk/source/Utility/PseudoTerminal.cpp

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-02 Thread Pavel Labath via Phabricator via lldb-commits 
labath updated this revision to Diff 80047.
labath added a comment.

A bit more cleanup.


https://reviews.llvm.org/D27305

Files:
  cmake/platforms/Android.cmake
  include/lldb/Core/RegularExpression.h
  include/lldb/Host/Config.h
  include/lldb/Host/Editline.h
  include/lldb/Host/Host.h
  include/lldb/Host/HostInfo.h
  include/lldb/Host/Time.h
  include/lldb/Host/linux/Personality.h
  include/lldb/Host/posix/Fcntl.h
  source/Host/common/Host.cpp
  source/Host/common/Socket.cpp
  source/Host/linux/ProcessLauncherLinux.cpp
  source/Host/posix/HostInfoPosix.cpp
  source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
  source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
  source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
  source/Utility/PseudoTerminal.cpp
  tools/driver/Driver.cpp

Index: tools/driver/Driver.cpp
===
--- tools/driver/Driver.cpp
+++ tools/driver/Driver.cpp
@@ -19,8 +19,6 @@
 #if defined(_WIN32)
 #include 
 #include 
-#elif defined(__ANDROID_NDK__)
-#include 
 #else
 #include 
 #endif
Index: source/Utility/PseudoTerminal.cpp
===
--- source/Utility/PseudoTerminal.cpp
+++ source/Utility/PseudoTerminal.cpp
@@ -20,7 +20,7 @@
 
 #include "lldb/Host/PosixApi.h"
 
-#if defined(__ANDROID_NDK__)
+#if defined(__ANDROID__)
 int posix_openpt(int flags);
 #endif
 
Index: source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
===
--- source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+++ source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
@@ -120,7 +120,7 @@
 // the same bytes size as "double"
 #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) &&   \
 !defined(_MSC_VER) && !defined(__mips__) && !defined(__powerpc__) &&   \
-!defined(__ANDROID_NDK__)
+!defined(__ANDROID__)
 case sizeof(long double):
   if (sizeof(long double) == sizeof(uint32_t)) {
 value.SetUInt32(reg_value, RegisterValue::eTypeLongDouble);
Index: source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
===
--- source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -9,7 +9,7 @@
 
 #include "ObjectContainerBSDArchive.h"
 
-#if defined(_WIN32) || defined(__ANDROID_NDK__)
+#if defined(_WIN32) || defined(__ANDROID__)
 // Defines from ar, missing on Windows
 #define ARMAG "!\n"
 #define SARMAG 8
Index: source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
===
--- source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
+++ source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
@@ -20,20 +20,15 @@
 #include "lldb/DataFormatters/StringPrinter.h"
 #include "lldb/DataFormatters/TypeSummary.h"
 #include "lldb/Host/Endian.h"
+#include "lldb/Host/Time.h"
 #include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Utility/ProcessStructReader.h"
 
 #include 
 
-#if __ANDROID_NDK__
-#include 
-#endif
-
-#include "lldb/Host/Time.h"
-
 using namespace lldb;
 using namespace lldb_private;
 using namespace lldb_private::formatters;
Index: source/Host/posix/HostInfoPosix.cpp
===
--- source/Host/posix/HostInfoPosix.cpp
+++ source/Host/posix/HostInfoPosix.cpp
@@ -48,7 +48,7 @@
   return false;
 }
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #endif
 #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
Index: source/Host/linux/ProcessLauncherLinux.cpp
===
--- source/Host/linux/ProcessLauncherLinux.cpp
+++ source/Host/linux/ProcessLauncherLinux.cpp
@@ -26,7 +26,7 @@
 using namespace lldb_private;
 
 static void FixupEnvironment(Args ) {
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
   // If there is no PATH variable specified inside the environment then set the
   // path to /system/bin. It is required because the default path used by
   // execve() is wrong on android.
Index: source/Host/common/Socket.cpp
===
--- source/Host/common/Socket.cpp
+++ source/Host/common/Socket.cpp
@@ -33,7 +33,7 @@
 #include "lldb/Host/linux/AbstractSocket.h"
 #endif
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #include 
 #include 
@@ -44,7 +44,7 @@
 #include 
 #include 
 #endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC
-#endif // __ANDROID_NDK__
+#endif // __ANDROID__
 
 using namespace lldb;
 using namespace lldb_private;
Index: source/Host/common/Host.cpp

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-02 Thread Pavel Labath via Phabricator via lldb-commits 
labath added a comment.

I've tried to unify this slightly, but sometimes further unification would make 
things inconsistent with surrounding preprocessor directives.

I was suprised by the presence of some of these ifdefs as well -- some of them 
seem completely unnecessary. I think that at some point I'll have to make 
another pass at this and clean them up.


https://reviews.llvm.org/D27305



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-02 Thread Pavel Labath via Phabricator via lldb-commits 
labath updated this revision to Diff 80043.
labath added a comment.

Update to use __ANDROID__


https://reviews.llvm.org/D27305

Files:
  cmake/platforms/Android.cmake
  include/lldb/Core/RegularExpression.h
  include/lldb/Host/Config.h
  include/lldb/Host/Editline.h
  include/lldb/Host/Host.h
  include/lldb/Host/HostInfo.h
  include/lldb/Host/Time.h
  include/lldb/Host/linux/Personality.h
  include/lldb/Host/posix/Fcntl.h
  source/Host/common/Host.cpp
  source/Host/common/Socket.cpp
  source/Host/linux/ProcessLauncherLinux.cpp
  source/Host/posix/HostInfoPosix.cpp
  source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
  source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
  source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
  source/Utility/PseudoTerminal.cpp
  tools/driver/Driver.cpp

Index: tools/driver/Driver.cpp
===
--- tools/driver/Driver.cpp
+++ tools/driver/Driver.cpp
@@ -19,7 +19,7 @@
 #if defined(_WIN32)
 #include 
 #include 
-#elif defined(__ANDROID_NDK__)
+#elif defined(__ANDROID__)
 #include 
 #else
 #include 
Index: source/Utility/PseudoTerminal.cpp
===
--- source/Utility/PseudoTerminal.cpp
+++ source/Utility/PseudoTerminal.cpp
@@ -20,7 +20,7 @@
 
 #include "lldb/Host/PosixApi.h"
 
-#if defined(__ANDROID_NDK__)
+#if defined(__ANDROID__)
 int posix_openpt(int flags);
 #endif
 
Index: source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
===
--- source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+++ source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
@@ -120,7 +120,7 @@
 // the same bytes size as "double"
 #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) &&   \
 !defined(_MSC_VER) && !defined(__mips__) && !defined(__powerpc__) &&   \
-!defined(__ANDROID_NDK__)
+!defined(__ANDROID__)
 case sizeof(long double):
   if (sizeof(long double) == sizeof(uint32_t)) {
 value.SetUInt32(reg_value, RegisterValue::eTypeLongDouble);
Index: source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
===
--- source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -9,7 +9,7 @@
 
 #include "ObjectContainerBSDArchive.h"
 
-#if defined(_WIN32) || defined(__ANDROID_NDK__)
+#if defined(_WIN32) || defined(__ANDROID__)
 // Defines from ar, missing on Windows
 #define ARMAG "!\n"
 #define SARMAG 8
Index: source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
===
--- source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
+++ source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
@@ -28,7 +28,7 @@
 
 #include 
 
-#if __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #endif
 
Index: source/Host/posix/HostInfoPosix.cpp
===
--- source/Host/posix/HostInfoPosix.cpp
+++ source/Host/posix/HostInfoPosix.cpp
@@ -48,7 +48,7 @@
   return false;
 }
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #endif
 #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
Index: source/Host/linux/ProcessLauncherLinux.cpp
===
--- source/Host/linux/ProcessLauncherLinux.cpp
+++ source/Host/linux/ProcessLauncherLinux.cpp
@@ -26,7 +26,7 @@
 using namespace lldb_private;
 
 static void FixupEnvironment(Args ) {
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
   // If there is no PATH variable specified inside the environment then set the
   // path to /system/bin. It is required because the default path used by
   // execve() is wrong on android.
Index: source/Host/common/Socket.cpp
===
--- source/Host/common/Socket.cpp
+++ source/Host/common/Socket.cpp
@@ -33,7 +33,7 @@
 #include "lldb/Host/linux/AbstractSocket.h"
 #endif
 
-#ifdef __ANDROID_NDK__
+#ifdef __ANDROID__
 #include 
 #include 
 #include 
@@ -44,7 +44,7 @@
 #include 
 #include 
 #endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC
-#endif // __ANDROID_NDK__
+#endif // __ANDROID__
 
 using namespace lldb;
 using namespace lldb_private;
Index: source/Host/common/Host.cpp
===
--- source/Host/common/Host.cpp
+++ source/Host/common/Host.cpp
@@ -29,7 +29,7 @@
 
 #if defined(__linux__) || defined(__FreeBSD__) ||  \
 defined(__FreeBSD_kernel__) || defined(__APPLE__) || defined(__NetBSD__)
-#if !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
+#if !defined(__ANDROID__)
 #include 
 #endif
 #include 
@@ -320,7 +320,7 @@
   return

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-02 Thread Tamas Berghammer via Phabricator via lldb-commits 
tberghammer added inline comments.



Comment at: include/lldb/Core/RegularExpression.h:34
 #else
-#if __ANDROID_NDK__
+#if ANDROID
 #include 

In most case you use "#ifdef". It would be nice to uniformalize



Comment at: source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp:31
 
-#if __ANDROID_NDK__
+#if ANDROID
 #include 

In most case you use "#ifdef". It would be nice to uniformalize



Comment at: 
source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp:123
 !defined(_MSC_VER) && !defined(__mips__) && !defined(__powerpc__) &&   
\
-!defined(__ANDROID_NDK__)
+!defined(ANDROID)
 case sizeof(long double):

(unrelated): What does an ANDROID specific define do in a MacOSX specific file?


https://reviews.llvm.org/D27305



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-01 Thread Pavel Labath via Phabricator via lldb-commits 
labath planned changes to this revision.
labath added a comment.

Thanks for the suggestion. I'll try using `__ANDROID__` instead.




Comment at: cmake/platforms/Android.cmake:36
 # flags and definitions
 remove_definitions( -DANDROID -D__ANDROID__ )
+add_definitions( -DANDROID -DLLDB_DISABLE_LIBEDIT )

danalbert wrote:
> You're removing it a line before just to add it back?
> 
> `__ANDROID__` is probably the one you want. That one is defined by Clang (and 
> GCC if that matters) for any Android target, so no need to worry about 
> dealing with it in cmake (or any other build system).
> 
> This isn't a concern right now, but if LLDB ever needed to become part of the 
> Android platform build, `ANDROID` doesn't actually mean `ANDROID`; it gets 
> set for host modules too :(
I have no idea who wrote this file, but a bit messy, and that's why I am trying 
to get rid of it. :)

I didn't know about the `__ANDROID__` thing. I'll try using that instead (and 
yes, I'd still like this to compile with gcc -- that's what we are using 
currently, although we may switch once this is sorted out).


https://reviews.llvm.org/D27305



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-01 Thread Dan Albert via Phabricator via lldb-commits 
danalbert added inline comments.



Comment at: cmake/platforms/Android.cmake:36
 # flags and definitions
 remove_definitions( -DANDROID -D__ANDROID__ )
+add_definitions( -DANDROID -DLLDB_DISABLE_LIBEDIT )

You're removing it a line before just to add it back?

`__ANDROID__` is probably the one you want. That one is defined by Clang (and 
GCC if that matters) for any Android target, so no need to worry about dealing 
with it in cmake (or any other build system).

This isn't a concern right now, but if LLDB ever needed to become part of the 
Android platform build, `ANDROID` doesn't actually mean `ANDROID`; it gets set 
for host modules too :(


https://reviews.llvm.org/D27305



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D27305: Replace __ANDROID_NDK__ with simply ANDROID

2016-12-01 Thread Pavel Labath via Phabricator via lldb-commits 
labath created this revision.
labath added reviewers: tberghammer, zturner.
labath added a subscriber: lldb-commits.
Herald added subscribers: mgorny, srhines, danalbert.

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. Our toolchain file defined both ANDROID and
__ANDROID_NDK__, while the NDK one just defines ANDROID. So, make things
consistent and just use ANDROID everywhere.

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.


https://reviews.llvm.org/D27305

Files:
  cmake/platforms/Android.cmake
  include/lldb/Core/RegularExpression.h
  include/lldb/Host/Config.h
  include/lldb/Host/Editline.h
  include/lldb/Host/Host.h
  include/lldb/Host/HostInfo.h
  include/lldb/Host/Time.h
  include/lldb/Host/linux/Personality.h
  include/lldb/Host/posix/Fcntl.h
  source/Host/common/Host.cpp
  source/Host/common/Socket.cpp
  source/Host/linux/ProcessLauncherLinux.cpp
  source/Host/posix/HostInfoPosix.cpp
  source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
  source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
  source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
  source/Utility/PseudoTerminal.cpp
  tools/driver/Driver.cpp

Index: tools/driver/Driver.cpp
===
--- tools/driver/Driver.cpp
+++ tools/driver/Driver.cpp
@@ -19,7 +19,7 @@
 #if defined(_WIN32)
 #include 
 #include 
-#elif defined(__ANDROID_NDK__)
+#elif defined(ANDROID)
 #include 
 #else
 #include 
Index: source/Utility/PseudoTerminal.cpp
===
--- source/Utility/PseudoTerminal.cpp
+++ source/Utility/PseudoTerminal.cpp
@@ -20,7 +20,7 @@
 
 #include "lldb/Host/PosixApi.h"
 
-#if defined(__ANDROID_NDK__)
+#if defined(ANDROID)
 int posix_openpt(int flags);
 #endif
 
Index: source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
===
--- source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+++ source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
@@ -120,7 +120,7 @@
 // the same bytes size as "double"
 #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) &&   \
 !defined(_MSC_VER) && !defined(__mips__) && !defined(__powerpc__) &&   \
-!defined(__ANDROID_NDK__)
+!defined(ANDROID)
 case sizeof(long double):
   if (sizeof(long double) == sizeof(uint32_t)) {
 value.SetUInt32(reg_value, RegisterValue::eTypeLongDouble);
Index: source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
===
--- source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -9,7 +9,7 @@
 
 #include "ObjectContainerBSDArchive.h"
 
-#if defined(_WIN32) || defined(__ANDROID_NDK__)
+#if defined(_WIN32) || defined(ANDROID)
 // Defines from ar, missing on Windows
 #define ARMAG "!\n"
 #define SARMAG 8
Index: source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
===
--- source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
+++ source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp
@@ -28,7 +28,7 @@
 
 #include 
 
-#if __ANDROID_NDK__
+#if ANDROID
 #include 
 #endif
 
Index: source/Host/posix/HostInfoPosix.cpp
===
--- source/Host/posix/HostInfoPosix.cpp
+++ source/Host/posix/HostInfoPosix.cpp
@@ -48,7 +48,7 @@
   return false;
 }
 
-#ifdef __ANDROID_NDK__
+#ifdef ANDROID
 #include 
 #endif
 #if defined(__ANDROID_API__) && __ANDROID_API__ < 21
Index: source/Host/linux/ProcessLauncherLinux.cpp
===
--- source/Host/linux/ProcessLauncherLinux.cpp
+++ source/Host/linux/ProcessLauncherLinux.cpp
@@ -26,7 +26,7 @@
 using namespace lldb_private;
 
 static void FixupEnvironment(Args ) {
-#ifdef __ANDROID_NDK__
+#ifdef ANDROID
   // If there is no PATH variable specified inside the environment then set the
   // path to /system/bin. It is required because the default path used by
   // execve() is wrong on android.
Index: source/Host/common/Socket.cpp
===
--- source/Host/common/Socket.cpp
+++ source/Host/common/Socket.cpp
@@ -33,7 +33,7 @@
 #include "lldb/Host/linux/AbstractSocket.h"
 #endif
 
-#ifdef __ANDROID_NDK__
+#ifdef ANDROID
 #include 
 #include 
 #include 
@@ -44,7 +44,7 @@
 #include 
 #include 
 #endif // ANDROID_ARM_BUILD_STATIC ||