maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb][test_suite] skip tests of `libstdcpp` on Android and clean up 

Summary: Delete the android target from `libstdcpp` test category, since android no longer support libstdcxx

Reviewers: xiaobai, labath

Reviewed By: labath

Subscribers: srhines, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D64771

llvm-svn: 366770
This commit is contained in:
Alex Langford 2019-07-23 00:28:26 +00:00
parent 6058b86373
commit e5001fe5c1
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lldb/packages/Python/lldbsuite/test/dotest.py
View File

@ -1154,8 +1154,10 @@ def canRunLibstdcxxTests():
from lldbsuite.test import lldbplatformutil from lldbsuite.test import lldbplatformutil
platform = lldbplatformutil.getPlatform() platform = lldbplatformutil.getPlatform()
if lldbplatformutil.target_is_android():
platform = "android"
if platform == "linux": if platform == "linux":
return True, "libstdcxx always present" return True, "libstdcxx always present"
return False, "Don't know how to build with libstdcxx on %s" % platform return False, "Don't know how to build with libstdcxx on %s" % platform
def checkLibstdcxxSupport(): def checkLibstdcxxSupport():

30
lldb/packages/Python/lldbsuite/test/make/Android.rules
View File

@ -72,24 +72,18 @@ endif
ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/sysroot \ ARCH_CFLAGS += --sysroot=$(NDK_ROOT)/sysroot \
-isystem $(NDK_ROOT)/sysroot/usr/include/$(TOOL_PREFIX) \ -isystem $(NDK_ROOT)/sysroot/usr/include/$(TOOL_PREFIX) \
-D__ANDROID_API__=$(API_LEVEL) -D__ANDROID_API__=$(API_LEVEL) \
-isystem $(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH)/usr/include
ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm ARCH_LDFLAGS += --sysroot=$(NDK_ROOT)/platforms/android-$(API_LEVEL)/arch-$(SYSROOT_ARCH) -lm
ifeq (1,$(USE_LIBSTDCPP)) ARCH_CXXFLAGS += \
ARCH_CFLAGS += \ -isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include \ -isystem $(NDK_ROOT)/sources/android/support/include \
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/include \ -isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/include
-isystem $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/include/backward
ARCH_LDFLAGS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a ARCH_LDFLAGS += \
else -L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \
ARCH_CXXFLAGS += \ $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++_static.a \
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++/include \ -lc++abi \
-isystem $(NDK_ROOT)/sources/android/support/include \ -nostdlib++
-isystem $(NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/include
ARCH_LDFLAGS += \
-L$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH) \
$(NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(STL_ARCH)/libc++_static.a \
-lc++abi
endif