| 1 | --- ./tools/lldb/cmake/LLDBDependencies.cmake 2016-06-29 18:00:18.000000000 +0530 |
| 2 | +++ ./tools/lldb/cmake/LLDBDependencies.cmake 2017-01-11 09:25:05.792269231 +0530 |
| 3 | @@ -96,7 +96,7 @@ |
| 4 | endif () |
| 5 | |
| 6 | # Linux-only libraries |
| 7 | -if ( CMAKE_SYSTEM_NAME MATCHES "Linux" ) |
| 8 | +if ( CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android" ) |
| 9 | list(APPEND LLDB_USED_LIBS |
| 10 | lldbPluginProcessLinux |
| 11 | lldbPluginProcessPOSIX |
| 12 | --- ./tools/lldb/cmake/modules/LLDBConfig.cmake 2016-05-26 21:41:04.000000000 +0530 |
| 13 | +++ ./tools/lldb/cmake/modules/LLDBConfig.cmake 2017-01-11 09:45:50.021125774 +0530 |
| 14 | @@ -14,13 +14,8 @@ |
| 15 | set(LLDB_DEFAULT_DISABLE_PYTHON 0) |
| 16 | set(LLDB_DEFAULT_DISABLE_CURSES 1) |
| 17 | else() |
| 18 | - if ( __ANDROID_NDK__ ) |
| 19 | - set(LLDB_DEFAULT_DISABLE_PYTHON 1) |
| 20 | - set(LLDB_DEFAULT_DISABLE_CURSES 1) |
| 21 | - else() |
| 22 | - set(LLDB_DEFAULT_DISABLE_PYTHON 0) |
| 23 | - set(LLDB_DEFAULT_DISABLE_CURSES 0) |
| 24 | - endif() |
| 25 | + set(LLDB_DEFAULT_DISABLE_PYTHON 0) |
| 26 | + set(LLDB_DEFAULT_DISABLE_CURSES 0) |
| 27 | endif() |
| 28 | |
| 29 | set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL |
| 30 | @@ -338,7 +333,7 @@ |
| 31 | list(APPEND system_libs ${CMAKE_DL_LIBS}) |
| 32 | endif() |
| 33 | |
| 34 | -if (CMAKE_SYSTEM_NAME MATCHES "Linux") |
| 35 | +if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "Android") |
| 36 | # Check for syscall used by lldb-server on linux. |
| 37 | # If these are not found, it will fall back to ptrace (slow) for memory reads. |
| 38 | check_cxx_source_compiles(" |
| 39 | @@ -367,7 +362,8 @@ |
| 40 | if ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR |
| 41 | (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR |
| 42 | (CMAKE_SYSTEM_NAME MATCHES "Linux") OR |
| 43 | - (CMAKE_SYSTEM_NAME MATCHES "NetBSD")) |
| 44 | + (CMAKE_SYSTEM_NAME MATCHES "NetBSD") OR |
| 45 | + (CMAKE_SYSTEM_NAME MATCHES "Android")) |
| 46 | set(LLDB_CAN_USE_LLDB_SERVER 1) |
| 47 | else() |
| 48 | set(LLDB_CAN_USE_LLDB_SERVER 0) |