[compiler-rt] r222915 - [asan] Remove the local copy of Android ucontext.h.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Nov 28 04:37:44 2014
New Revision: 222915

URL: http://llvm.org/viewvc/llvm-project?rev=222915&view=rev
Log:
[asan] Remove the local copy of Android ucontext.h.

This header is present in the r10c release of the NDK.

Removed:
    compiler-rt/trunk/android/
Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/lib/asan/CMakeLists.txt
    compiler-rt/trunk/make/platform/clang_linux.mk

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=222915&r1=222914&r2=222915&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Fri Nov 28 04:37:44 2014
@@ -162,8 +162,6 @@ set(COMPILER_RT_BINARY_DIR ${CMAKE_CURRE
 # Setup custom SDK sysroots.
 set(COMPILER_RT_LINUX_SDK_SYSROOT ${COMPILER_RT_SOURCE_DIR}/SDKs/linux)
 
-set(COMPILER_RT_EXTRA_ANDROID_HEADERS ${COMPILER_RT_SOURCE_DIR}/android/include)
-
 # Detect whether the current target platform is 32-bit or 64-bit, and setup
 # the correct commandline flags needed to attempt to target 32-bit and 64-bit.
 if (NOT CMAKE_SIZEOF_VOID_P EQUAL 4 AND

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=222915&r1=222914&r2=222915&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Fri Nov 28 04:37:44 2014
@@ -29,10 +29,6 @@ set(ASAN_PREINIT_SOURCES
 
 include_directories(..)
 
-if(ANDROID)
-  include_directories(${COMPILER_RT_EXTRA_ANDROID_HEADERS})
-endif()
-
 set(ASAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
 append_no_rtti_flag(ASAN_CFLAGS)
 

Modified: compiler-rt/trunk/make/platform/clang_linux.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=222915&r1=222914&r2=222915&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_linux.mk (original)
+++ compiler-rt/trunk/make/platform/clang_linux.mk Fri Nov 28 04:37:44 2014
@@ -116,8 +116,7 @@ ANDROID_COMMON_FLAGS := -target arm-linu
 	--sysroot=$(LLVM_ANDROID_TOOLCHAIN_DIR)/sysroot \
 	-B$(LLVM_ANDROID_TOOLCHAIN_DIR)
 CFLAGS.asan-arm-android := $(CFLAGS) $(SANITIZER_CFLAGS) \
-	$(ANDROID_COMMON_FLAGS) -fno-rtti \
-	-I$(ProjSrcRoot)/android/include
+	$(ANDROID_COMMON_FLAGS) -fno-rtti
 LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \
 	-lstdc++ -Wl,-soname=libclang_rt.asan-arm-android.so -Wl,-z,defs