testsuite/android: build test executables with the android ndk directly

[labath]

Summary

This teaches the test makefiles about the Android NDK, so we are able to
run the tests without first going through the make_standalone_toolchain
script. The motivation for this is the ability to run both libc++ and
libstdc++ tests together, which previously was not possible because
make_standalone_toolchain bakes in the STL to use during toolchain
creation time. The support for this is not present yet -- this change
only make sure we don't regress for existing funcionality (gcc w/
libstdc++). Clang and libc++ support will be added later.

[tberghammer]

LGTM, assuming that it works on all 3 OSes

packages/Python/lldbsuite/test/make/Android.rules

1 ↗

(On Diff #89890)

Will this file work on Windows (e.g. dirname, realpath, forward slash)?

4–13 ↗

(On Diff #89890)

Does it make sense to use a different API level for every architecture? I think making it somewhat consistent would make it easier to use it

[labath]

packages/Python/lldbsuite/test/make/Android.rules

1 ↗

(On Diff #89890)

I copied this from the main makefile, so I am pretty sure it will. Why will it work is a different question though. :)

4–13 ↗

(On Diff #89890)

Well.. there's no guarantee that an API 21 file will run on an older device. They seem to run fine, but I'd like to avoid relying on that if it is possible. We can always increase the number if it becomes a maintenance burden.

lldb/trunk/packages/Python/lldbsuite/test/make/Android.rules

+NDK_ROOT := $(shell dirname $(CC))/../../../../..
+NDK_ROOT := $(realpath $(NDK_ROOT))
+
+ifeq "$(findstring 64, $(ARCH))" "64"
+  # lowest 64-bit API level
+  API_LEVEL := 21
+else ifeq "$(ARCH)" "i386"
+  # clone(2) declaration is present only since this api level
+  API_LEVEL := 17
+else
+  # lowest supported 32-bit API level
+  API_LEVEL := 9
+endif
+
+ifeq "$(ARCH)" "arm"
+  SYSROOT_ARCH := arm
+  STL_ARCH := armeabi-v7a
+  ARCH_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -marm
+else ifeq "$(ARCH)" "aarch64"
+  SYSROOT_ARCH := arm64
+  STL_ARCH := arm64-v8a
+else ifeq "$(ARCH)" "i386"
+  SYSROOT_ARCH := x86
+  STL_ARCH := x86
+else ifeq "$(ARCH)" "mips64r6"
+  SYSROOT_ARCH := mips64
+  STL_ARCH := mips64
+else ifeq "$(ARCH)" "mips32"
+  SYSROOT_ARCH := mips
+  STL_ARCH := mips
+else
+  SYSROOT_ARCH := $(ARCH)
+  STL_ARCH := $(ARCH)
+endif
+
+ARCH_CFLAGS += \
+  --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) \
+  -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include \
+  -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/include \
+  -isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
+ARCH_LDFLAGS += -lm \
+  $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a \
+  --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH)

lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules

 THIS_FILE_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/
 LLDB_BASE_DIR := $(THIS_FILE_DIR)../../../../../
 
 
 #----------------------------------------------------------------------
 # If TRIPLE is not defined try to set the ARCH, CC, CFLAGS, and more
 # from the triple alone
 #----------------------------------------------------------------------
-TRIPLE_CFLAGS :=
+ARCH_CFLAGS :=
 ifneq "$(TRIPLE)" ""
   triple_space = $(subst -, ,$(TRIPLE))
   ARCH =$(word 1, $(triple_space))
   TRIPLE_VENDOR =$(word 2, $(triple_space))
   triple_os_and_version =$(shell echo $(word 3, $(triple_space)) | sed 's/\([a-z]*\)\(.*\)/\1 \2/')
   TRIPLE_OS =$(word 1, $(triple_os_and_version))
   TRIPLE_VERSION =$(word 2, $(triple_os_and_version))
   ifeq "$(TRIPLE_VENDOR)" "apple"
     ifeq "$(TRIPLE_OS)" "ios"
         ifeq "$(SDKROOT)" ""
         # Set SDKROOT if it wasn't set
         ifneq (,$(findstring arm,$(ARCH)))
           SDKROOT = $(shell xcrun --sdk iphoneos --show-sdk-path)
           ifeq "$(TRIPLE_VERSION)" ""
             TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
           endif
-          TRIPLE_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
+          ARCH_CFLAGS :=-mios-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
         else
           SDKROOT = $(shell xcrun --sdk iphonesimulator --show-sdk-path)
           ifeq "$(TRIPLE_VERSION)" ""
             TRIPLE_VERSION =$(shell echo $(notdir $(SDKROOT)) | sed -e 's/.*\([0-9]\.[0-9]\).*/\1/')
           endif
-          TRIPLE_CFLAGS :=-mios-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
+          ARCH_CFLAGS :=-mios-simulator-version-min=$(TRIPLE_VERSION) -isysroot "$(SDKROOT)"
         endif
       endif
     endif
   endif
 endif
+ifeq "$(OS)" "Android"
+  include $(THIS_FILE_DIR)/Android.rules
+endif
 
 #----------------------------------------------------------------------
 # If OS is not defined, use 'uname -s' to determine the OS name.
 #
 # uname on Windows gives "windows32", but most environments standardize
 # on "Windows_NT", so we'll make it consistent here.  When running
 # tests from Visual Studio, the environment variable isn't inherited
 # all the way down to the process spawned for make.

 
 CFLAGS ?= $(DEBUG_INFO_FLAG) -O0 -fno-builtin
 ifeq "$(OS)" "Darwin"
   CFLAGS += $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -I$(LLDB_BASE_DIR)include
 else
   CFLAGS += $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) -I$(LLDB_BASE_DIR)include
 endif
 
-CFLAGS += -include $(THIS_FILE_DIR)test_common.h $(TRIPLE_CFLAGS)
+CFLAGS += -include $(THIS_FILE_DIR)test_common.h $(ARCH_CFLAGS)
 
 # Use this one if you want to build one part of the result without debug information:
 ifeq "$(OS)" "Darwin"
-  CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(TRIPLE_CFLAGS)
+  CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG) $(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(ARCH_CFLAGS)
 else
-  CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(TRIPLE_CFLAGS)
+  CFLAGS_NO_DEBUG = -O0 $(ARCHFLAG)$(ARCH) $(FRAMEWORK_INCLUDES) $(CFLAGS_EXTRAS) $(ARCH_CFLAGS)
 endif
 
 ifeq "$(MAKE_DWO)" "YES"
   CFLAGS += -gsplit-dwarf
 endif
 
 ifeq "$(MAKE_GMODULES)" "YES"
   CFLAGS += -fmodules -gmodules
 endif
 
 CXXFLAGS += -std=c++11
 # FIXME: C++ modules aren't supported on all platforms.
 CXXFLAGS += $(subst -fmodules,, $(CFLAGS))
 LD = $(CC)
 LDFLAGS ?= $(CFLAGS)
-LDFLAGS += $(LD_EXTRAS)
+LDFLAGS += $(LD_EXTRAS) $(ARCH_LDFLAGS)
 ifeq (,$(filter $(OS), Windows_NT Android))
   ifneq (,$(filter YES,$(ENABLE_THREADS)))
     LDFLAGS += -pthread
   endif
 endif
 OBJECTS =
 EXE ?= a.out