From c962c6ac3bfd3eee9f54d2f9533e289ca094cc8a Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Thu, 1 Dec 2016 17:48:51 +0000 Subject: [PATCH] Remove another hack from the android toolchain file This is no longer an issue with recent versions of the android ndk. llvm-svn: 288387 --- lldb/cmake/platforms/Android.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lldb/cmake/platforms/Android.cmake b/lldb/cmake/platforms/Android.cmake index d28ec3626945..04c73af9fea2 100644 --- a/lldb/cmake/platforms/Android.cmake +++ b/lldb/cmake/platforms/Android.cmake @@ -163,12 +163,3 @@ set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOOLCHAIN_DIR}/bin" "${ANDROID_TOOLCHAIN_DI set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY ) set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY ) - -################# BEGIN EVIL HACK ################## -# In the android-arm NDK unwind.h and link.h contains 2 conflicting -# typedef for _Unwind_Ptr. Force HAVE_UNWIND_BACKTRACE to 0 to prevent -# LLVM from finding unwind.h what would break the build. -if ( ANDROID_ABI STREQUAL "armeabi" ) - set( HAVE_UNWIND_BACKTRACE 0 CACHE INTERNAL "Hack to disable the finding of unwind.h on Android arm" ) -endif() -################# END EVIL HACK ####################