[Lldb-commits] [lldb] r293287 - Address post-commit review remarks

[Pavel Labath via lldb-commits]

Author: labath
Date: Fri Jan 27 09:19:03 2017
New Revision: 293287

URL: http://llvm.org/viewvc/llvm-project?rev=293287&view=rev
Log:
Address post-commit review remarks

Tamas pointed out that the macro name I used in r293282 was too vague.
Rename it to better reflect what it is used for.

Modified:
    lldb/trunk/cmake/modules/LLDBConfig.cmake
    lldb/trunk/source/Host/common/Socket.cpp

Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=293287&r1=293286&r2=293287&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBConfig.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBConfig.cmake Fri Jan 27 09:19:03 2017
@@ -414,7 +414,7 @@ endif()
 
 if ((CMAKE_SYSTEM_NAME MATCHES "Android") AND LLVM_BUILD_STATIC AND
     ((ANDROID_ABI MATCHES "armeabi") OR (ANDROID_ABI MATCHES "mips")))
-  add_definitions(-DANDROID_BUILD_STATIC)
+  add_definitions(-DANDROID_USE_ACCEPT_WORKAROUND)
 endif()
 
 find_package(Backtrace)

Modified: lldb/trunk/source/Host/common/Socket.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Socket.cpp?rev=293287&r1=293286&r2=293287&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Socket.cpp (original)
+++ lldb/trunk/source/Host/common/Socket.cpp Fri Jan 27 09:19:03 2017
@@ -422,7 +422,7 @@ NativeSocket Socket::AcceptSocket(Native
                                   socklen_t *addrlen,
                                   bool child_processes_inherit, Error &error) {
   error.Clear();
-#if defined(ANDROID_BUILD_STATIC)
+#if defined(ANDROID_USE_ACCEPT_WORKAROUND)
   // Hack:
   // This enables static linking lldb-server to an API 21 libc, but still having
   // it run on older devices. It is necessary because API 21 libc's