Android target support (as part of LLDB build)

[tberghammer]

Summary

Some minor changes needed in order to build LLVM as part of LLDB build using Android NDK. A new define ANDROID_NDK is used in order to differentiate from LLVM standalone build vs LLVM as part of LLDB build.

[vharron]

Why are you using the __ANDROID_NDK__ define?  I think we should use __ANDROID__ instead.  If it's not defined in out build, we should define it (instead of __ANDROID_NDK__)

I've checked Android NDK versions 3, 9, and 21 and all of them automatically have these symbols defined when building with Android.mk

__ANDROID__
ANDROID

vharron@tifa:~/dev/defines$ cat jni/main.c
#include <stdio.h>

int
main() {

#ifdef __ANDROID__
  printf("__ANDROID__\n");
#endif
#ifdef ANDROID
  printf("ANDROID\n");
#endif
#ifdef __ANDROID_NDK__
  printf("__ANDROID_NDK__\n");
#endif

}

vharron@tifa:~/dev/defines$ strings libs/armeabi/libhello-android-9.so | egrep ANDROID
__ANDROID__
ANDROID
vharron@tifa:~/dev/defines$ vi jni/Application.mk
vharron@tifa:~/dev/defines$ ~/Downloads/android-ndk-r10c/ndk-build
[armeabi] Compile thumb  : hello-android-21 <= main.c
[armeabi] SharedLibrary  : libhello-android-21.so
[armeabi] Install        : libhello-android-21.so => libs/armeabi/libhello-android-21.so
vharron@tifa:~/dev/defines$ strings libs/armeabi/libhello-android-21.so | egrep ANDROID
__ANDROID__
ANDROID

[vharron]

Tamas, please commandeer this revision and use or close.

[tberghammer]

I don't fully understand what is the goal of this CL, but I think most of it don't make too much help to us now, so I will abandon it.

include/llvm/Target/TargetLibraryInfo.h

 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Pass.h"
 
+#if defined(__ANDROID_NDK__)
+// some versions of Android NDK have these macros defined
+#undef stat64
+#undef lstat64
+#undef fstat64
+#endif
+
 namespace llvm {
   class Triple;
 

include/llvm/Transforms/Instrumentation.h

 
 #include "llvm/ADT/StringRef.h"
 
-#if defined(__GNUC__) && defined(__linux__) && !defined(ANDROID)
+#if defined(__GNUC__) && defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID_NDK__)
 inline void *getDFSanArgTLSPtrForJIT() {
   extern __thread __attribute__((tls_model("initial-exec")))
     void *__dfsan_arg_tls;

                                         void *(*getArgTLS)() = nullptr,
                                         void *(*getRetValTLS)() = nullptr);
 
-#if defined(__GNUC__) && defined(__linux__) && !defined(ANDROID)
+#if defined(__GNUC__) && defined(__linux__) && !defined(ANDROID) && !defined(__ANDROID_NDK__)
 inline ModulePass *createDataFlowSanitizerPassForJIT(StringRef ABIListFile =
                                                          StringRef()) {
   return createDataFlowSanitizerPass(ABIListFile, getDFSanArgTLSPtrForJIT,

lib/Support/DynamicLibrary.cpp

 // On linux we have a weird situation. The stderr/out/in symbols are both
 // macros and global variables because of standards requirements. So, we
 // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
-#if defined(__linux__) and !defined(__ANDROID__)
+#if defined(__linux__) and !defined(__ANDROID__) and !defined(__ANDROID_NDK__)
   {
     EXPLICIT_SYMBOL(stderr);
     EXPLICIT_SYMBOL(stdout);

lib/Support/LockFileManager.cpp

 }
 
 bool LockFileManager::processStillExecuting(StringRef Hostname, int PID) {
-#if LLVM_ON_UNIX && !defined(__ANDROID__)
+#if LLVM_ON_UNIX && !defined(__ANDROID__) && !defined(__ANDROID_NDK__)
   char MyHostname[256];
   MyHostname[255] = 0;
   MyHostname[0] = 0;

lib/Support/Unix/Memory.inc

   __clear_cache(const_cast<char *>(Start), const_cast<char *>(End));
 #  elif defined(__mips__)
   const char *Start = static_cast<const char *>(Addr);
-#    if defined(ANDROID)
+#    if defined(ANDROID) || defined(__ANDROID_NDK__)
   // The declaration of "cacheflush" in Android bionic:
   // extern int cacheflush(long start, long end, long flags);
   const char *End = Start + Len;

lib/Transforms/Hello/CMakeLists.txt

   endif()
 endif()
 
-if(WIN32 OR CYGWIN)
+if(WIN32 OR CYGWIN OR __ANDROID_NDK__)
   set(LLVM_LINK_COMPONENTS Core Support)
 endif()
 

tools/bugpoint-passes/CMakeLists.txt

   endif()
 endif()
 
-if(WIN32 OR CYGWIN)
+if(WIN32 OR CYGWIN OR __ANDROID_NDK__)
   set(LLVM_LINK_COMPONENTS Core)
 endif()
 

utils/unittest/googletest/include/gtest/internal/gtest-port.h

 # define GTEST_OS_FREEBSD 1
 #elif defined __linux__
 # define GTEST_OS_LINUX 1
-# if defined(ANDROID) || defined(__ANDROID__)
+# if defined(ANDROID) || defined(__ANDROID__) || defined(__ANDROID_NDK__)
 #  define GTEST_OS_LINUX_ANDROID 1
 # endif  // ANDROID
 #elif defined __MVS__

 
 // Defines this to true iff Google Test can use POSIX regular expressions.
 #ifndef GTEST_HAS_POSIX_RE
-# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS)
+# define GTEST_HAS_POSIX_RE (!GTEST_OS_WINDOWS && !defined(__ANDROID_NDK__))
 #endif
 
 #if GTEST_HAS_POSIX_RE

 #ifndef GTEST_HAS_CLONE
 // The user didn't tell us, so we need to figure it out.
 
-# if GTEST_OS_LINUX && !defined(__ia64__)
+# if GTEST_OS_LINUX && !defined(__ia64__) && !defined(__ANDROID_NDK__)
 #  define GTEST_HAS_CLONE 1
 # else
 #  define GTEST_HAS_CLONE 0