[Lldb-commits] [lldb] r288387 - Remove another hack from the android toolchain file

[Pavel Labath via lldb-commits]

Author: labath
Date: Thu Dec  1 11:48:51 2016
New Revision: 288387

URL: http://llvm.org/viewvc/llvm-project?rev=288387&view=rev
Log:
Remove another hack from the android toolchain file

This is no longer an issue with recent versions of the android ndk.

Modified:
    lldb/trunk/cmake/platforms/Android.cmake

Modified: lldb/trunk/cmake/platforms/Android.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/platforms/Android.cmake?rev=288387&r1=288386&r2=288387&view=diff
==============================================================================
--- lldb/trunk/cmake/platforms/Android.cmake (original)
+++ lldb/trunk/cmake/platforms/Android.cmake Thu Dec  1 11:48:51 2016
@@ -163,12 +163,3 @@ set( CMAKE_FIND_ROOT_PATH "${ANDROID_TOO
 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 ####################