[Lldb-commits] [PATCH] D28775: [cmake] Make lldb build with the android ndk toolchain file

2017-01-17 Thread Pavel Labath via Phabricator via lldb-commits 
This revision was automatically updated to reflect the committed changes.
Closed by commit rL292212: [cmake] Make lldb build with the android ndk 
toolchain file (authored by labath).

Changed prior to commit:
  https://reviews.llvm.org/D28775?vs=84571&id=84651#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D28775

Files:
  lldb/trunk/CMakeLists.txt
  lldb/trunk/cmake/LLDBDependencies.cmake
  lldb/trunk/cmake/modules/LLDBConfig.cmake
  lldb/trunk/cmake/platforms/Android.cmake
  lldb/trunk/source/Host/CMakeLists.txt
  lldb/trunk/source/Plugins/Process/CMakeLists.txt
  lldb/trunk/tools/lldb-server/CMakeLists.txt

Index: lldb/trunk/cmake/modules/LLDBConfig.cmake
===
--- lldb/trunk/cmake/modules/LLDBConfig.cmake
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake
@@ -13,14 +13,12 @@
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
   set(LLDB_DEFAULT_DISABLE_PYTHON 0)
   set(LLDB_DEFAULT_DISABLE_CURSES 1)
+elseif (CMAKE_SYSTEM_NAME MATCHES "Android" )
+  set(LLDB_DEFAULT_DISABLE_PYTHON 1)
+  set(LLDB_DEFAULT_DISABLE_CURSES 1)
 else()
-  if ( __ANDROID_NDK__ )
-set(LLDB_DEFAULT_DISABLE_PYTHON 1)
-set(LLDB_DEFAULT_DISABLE_CURSES 1)
-  else()
-set(LLDB_DEFAULT_DISABLE_PYTHON 0)
-set(LLDB_DEFAULT_DISABLE_CURSES 0)
-  endif()
+  set(LLDB_DEFAULT_DISABLE_PYTHON 0)
+  set(LLDB_DEFAULT_DISABLE_CURSES 0)
 endif()
 
 set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL
@@ -354,10 +352,7 @@
 
 # Figure out if lldb could use lldb-server.  If so, then we'll
 # ensure we build lldb-server when an lldb target is being built.
-if ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR
-(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR
-(CMAKE_SYSTEM_NAME MATCHES "Linux") OR
-(CMAKE_SYSTEM_NAME MATCHES "NetBSD"))
+if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
 set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
 set(LLDB_CAN_USE_LLDB_SERVER 0)
Index: lldb/trunk/cmake/platforms/Android.cmake
===
--- lldb/trunk/cmake/platforms/Android.cmake
+++ lldb/trunk/cmake/platforms/Android.cmake
@@ -29,13 +29,12 @@
  return()
 endif()
 
-set( CMAKE_SYSTEM_NAME Linux )
+set( CMAKE_SYSTEM_NAME Android )
 include( CMakeForceCompiler )
 
 # flags and definitions
 add_definitions( -DANDROID -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
Index: lldb/trunk/cmake/LLDBDependencies.cmake
===
--- lldb/trunk/cmake/LLDBDependencies.cmake
+++ lldb/trunk/cmake/LLDBDependencies.cmake
@@ -97,7 +97,7 @@
 endif ()
 
 # Linux-only libraries
-if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if ( CMAKE_SYSTEM_NAME MATCHES "Linux|Android" )
   list(APPEND LLDB_USED_LIBS
 lldbPluginProcessLinux
 lldbPluginProcessPOSIX
Index: lldb/trunk/CMakeLists.txt
===
--- lldb/trunk/CMakeLists.txt
+++ lldb/trunk/CMakeLists.txt
@@ -4,7 +4,7 @@
 include(cmake/modules/LLDBConfig.cmake)
 include(cmake/modules/AddLLDB.cmake)
 
-if (__ANDROID_NDK__ OR (CMAKE_SYSTEM_NAME MATCHES "Windows"))
+if (CMAKE_SYSTEM_NAME MATCHES "Windows|Android")
   set(LLDB_DEFAULT_DISABLE_LIBEDIT 1)
 else()
   set(LLDB_DEFAULT_DISABLE_LIBEDIT 0)
Index: lldb/trunk/source/Host/CMakeLists.txt
===
--- lldb/trunk/source/Host/CMakeLists.txt
+++ lldb/trunk/source/Host/CMakeLists.txt
@@ -88,7 +88,7 @@
 posix/PipePosix.cpp
 )
 
-  if (NOT __ANDROID_NDK__)
+  if (NOT (CMAKE_SYSTEM_NAME MATCHES "Android"))
 add_host_subdirectory(posix
   posix/ProcessLauncherPosix.cpp
   )
@@ -110,13 +110,7 @@
   macosx/cfcpp/CFCString.cpp
   )
 
-  elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
-if (__ANDROID_NDK__)
-  add_host_subdirectory(android
-android/HostInfoAndroid.cpp
-android/LibcGlue.cpp
-)
-endif()
+  elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
 add_host_subdirectory(linux
   linux/AbstractSocket.cpp
   linux/Host.cpp
@@ -126,7 +120,12 @@
   linux/ProcessLauncherLinux.cpp
   linux/ThisThread.cpp
   )
-
+if (CMAKE_SYSTEM_NAME MATCHES "Android")
+  add_host_subdirectory(android
+android/HostInfoAndroid.cpp
+android/LibcGlue.cpp
+)
+endif()
   elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 add_host_subdirectory(freebsd
   freebsd/Host.cpp
Index: lldb/trunk/source/Plugins/Process/CMakeLists.txt
===
--- lldb/trunk/source/Plugins/Process/CMakeLists.txt
+++ lldb/trunk/source/Plugins/Process/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
   add_subdirectory(Linux)
   add_sub

[Lldb-commits] [PATCH] D28775: [cmake] Make lldb build with the android ndk toolchain file

2017-01-17 Thread Tamas Berghammer via Phabricator via lldb-commits 
tberghammer accepted this revision.
tberghammer added a comment.
This revision is now accepted and ready to land.

LGTM


https://reviews.llvm.org/D28775



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

[Lldb-commits] [PATCH] D28775: [cmake] Make lldb build with the android ndk toolchain file

2017-01-16 Thread Pavel Labath via Phabricator via lldb-commits 
labath created this revision.
labath added reviewers: tberghammer, danalbert.
labath added a subscriber: lldb-commits.
Herald added subscribers: mgorny, srhines.

The NDK cmake toolchain file defines CMAKE_SYSTEM_NAME=Android, so switch the
build to use that. I have also updated the in-tree toolchain file to do that
(instead of defining __ANDROID_NDK__), so it can still be used to build.
After migrating the last bits of non-toolchainy bits out of the in-tree
toolchain, I intend to delete it.


https://reviews.llvm.org/D28775

Files:
  CMakeLists.txt
  cmake/LLDBDependencies.cmake
  cmake/modules/LLDBConfig.cmake
  cmake/platforms/Android.cmake
  source/Host/CMakeLists.txt
  source/Plugins/Process/CMakeLists.txt
  tools/lldb-server/CMakeLists.txt

Index: tools/lldb-server/CMakeLists.txt
===
--- tools/lldb-server/CMakeLists.txt
+++ tools/lldb-server/CMakeLists.txt
@@ -77,7 +77,7 @@
   )
 
 # Linux-only libraries
-if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if ( CMAKE_SYSTEM_NAME MATCHES "Linux|Android" )
   list(APPEND LLDB_USED_LIBS
 lldbPluginProcessLinux
 lldbPluginProcessPOSIX
Index: source/Plugins/Process/CMakeLists.txt
===
--- source/Plugins/Process/CMakeLists.txt
+++ source/Plugins/Process/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
   add_subdirectory(Linux)
   add_subdirectory(POSIX)
 elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
Index: source/Host/CMakeLists.txt
===
--- source/Host/CMakeLists.txt
+++ source/Host/CMakeLists.txt
@@ -88,7 +88,7 @@
 posix/PipePosix.cpp
 )
 
-  if (NOT __ANDROID_NDK__)
+  if (NOT (CMAKE_SYSTEM_NAME MATCHES "Android"))
 add_host_subdirectory(posix
   posix/ProcessLauncherPosix.cpp
   )
@@ -110,13 +110,7 @@
   macosx/cfcpp/CFCString.cpp
   )
 
-  elseif (CMAKE_SYSTEM_NAME MATCHES "Linux")
-if (__ANDROID_NDK__)
-  add_host_subdirectory(android
-android/HostInfoAndroid.cpp
-android/LibcGlue.cpp
-)
-endif()
+  elseif (CMAKE_SYSTEM_NAME MATCHES "Linux|Android")
 add_host_subdirectory(linux
   linux/AbstractSocket.cpp
   linux/Host.cpp
@@ -126,7 +120,12 @@
   linux/ProcessLauncherLinux.cpp
   linux/ThisThread.cpp
   )
-
+if (CMAKE_SYSTEM_NAME MATCHES "Android")
+  add_host_subdirectory(android
+android/HostInfoAndroid.cpp
+android/LibcGlue.cpp
+)
+endif()
   elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 add_host_subdirectory(freebsd
   freebsd/Host.cpp
Index: cmake/platforms/Android.cmake
===
--- cmake/platforms/Android.cmake
+++ cmake/platforms/Android.cmake
@@ -29,13 +29,12 @@
  return()
 endif()
 
-set( CMAKE_SYSTEM_NAME Linux )
+set( CMAKE_SYSTEM_NAME Android )
 include( CMakeForceCompiler )
 
 # flags and definitions
 add_definitions( -DANDROID -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
Index: cmake/modules/LLDBConfig.cmake
===
--- cmake/modules/LLDBConfig.cmake
+++ cmake/modules/LLDBConfig.cmake
@@ -13,14 +13,12 @@
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
   set(LLDB_DEFAULT_DISABLE_PYTHON 0)
   set(LLDB_DEFAULT_DISABLE_CURSES 1)
+elseif (CMAKE_SYSTEM_NAME MATCHES "Android" )
+  set(LLDB_DEFAULT_DISABLE_PYTHON 1)
+  set(LLDB_DEFAULT_DISABLE_CURSES 1)
 else()
-  if ( __ANDROID_NDK__ )
-set(LLDB_DEFAULT_DISABLE_PYTHON 1)
-set(LLDB_DEFAULT_DISABLE_CURSES 1)
-  else()
-set(LLDB_DEFAULT_DISABLE_PYTHON 0)
-set(LLDB_DEFAULT_DISABLE_CURSES 0)
-  endif()
+  set(LLDB_DEFAULT_DISABLE_PYTHON 0)
+  set(LLDB_DEFAULT_DISABLE_CURSES 0)
 endif()
 
 set(LLDB_DISABLE_PYTHON ${LLDB_DEFAULT_DISABLE_PYTHON} CACHE BOOL
@@ -354,10 +352,7 @@
 
 # Figure out if lldb could use lldb-server.  If so, then we'll
 # ensure we build lldb-server when an lldb target is being built.
-if ((CMAKE_SYSTEM_NAME MATCHES "Darwin") OR
-(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") OR
-(CMAKE_SYSTEM_NAME MATCHES "Linux") OR
-(CMAKE_SYSTEM_NAME MATCHES "NetBSD"))
+if (CMAKE_SYSTEM_NAME MATCHES "Android|Darwin|FreeBSD|Linux|NetBSD")
 set(LLDB_CAN_USE_LLDB_SERVER 1)
 else()
 set(LLDB_CAN_USE_LLDB_SERVER 0)
Index: cmake/LLDBDependencies.cmake
===
--- cmake/LLDBDependencies.cmake
+++ cmake/LLDBDependencies.cmake
@@ -97,7 +97,7 @@
 endif ()
 
 # Linux-only libraries
-if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+if ( CMAKE_SYSTEM_NAME MATCHES "Linux|Android" )
   list(APPEND LLDB_USED_LIBS
 lldbPluginProcessLinux
 lldbPluginProcessPOSIX
Index: CMakeLists.