Author: chaoren
Date: Tue Oct 6 19:01:06 2015
New Revision: 249486
URL: http://llvm.org/viewvc/llvm-project?rev=249486&view=rev
Log:
Fix Android build.
Modified:
lldb/trunk/CMakeLists.txt
lldb/trunk/cmake/platforms/Android.cmake
lldb/trunk/source/CMakeLists.txt
Modified: lldb/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=249486&r1=249485&r2=249486&view=diff
==============================================================================
--- lldb/trunk/CMakeLists.txt (original)
+++ lldb/trunk/CMakeLists.txt Tue Oct 6 19:01:06 2015
@@ -4,6 +4,12 @@ include(cmake/modules/LLDBStandalone.cma
include(cmake/modules/LLDBConfig.cmake)
include(cmake/modules/AddLLDB.cmake)
+if (__ANDROID_NDK__ OR (CMAKE_SYSTEM_NAME MATCHES "Windows"))
+ set(LLDB_DEFAULT_DISABLE_LIBEDIT 1)
+else()
+ set(LLDB_DEFAULT_DISABLE_LIBEDIT 0)
+endif ()
+
# We need libedit support to go down both the source and
# the scripts directories.
set(LLDB_DISABLE_LIBEDIT ${LLDB_DEFAULT_DISABLE_LIBEDIT} CACHE BOOL "Disables
the use of editline.")
Modified: lldb/trunk/cmake/platforms/Android.cmake
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/platforms/Android.cmake?rev=249486&r1=249485&r2=249486&view=diff
==============================================================================
--- lldb/trunk/cmake/platforms/Android.cmake (original)
+++ lldb/trunk/cmake/platforms/Android.cmake Tue Oct 6 19:01:06 2015
@@ -37,6 +37,7 @@ remove_definitions( -DANDROID -D__ANDROI
add_definitions( -DANDROID -D__ANDROID_NDK__ -DLLDB_DISABLE_LIBEDIT )
set( ANDROID True )
set( __ANDROID_NDK__ True )
+set( LLDB_DEFAULT_DISABLE_LIBEDIT True )
# linking lldb-server statically for Android avoids the need to ship two
# binaries (pie for API 21+ and non-pie for API 16-). It's possible to use
Modified: lldb/trunk/source/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=249486&r1=249485&r2=249486&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Tue Oct 6 19:01:06 2015
@@ -1,11 +1,5 @@
include_directories(.)
-if (__ANDROID_NDK__ OR (CMAKE_SYSTEM_NAME MATCHES "Windows"))
- set(LLDB_DEFAULT_DISABLE_LIBEDIT 1)
-else()
- set(LLDB_DEFAULT_DISABLE_LIBEDIT 0)
-endif ()
-
if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
include_directories(
Plugins/Process/Linux
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
