Skip to content

Commit e289cb5

Browse files
authored
[lldb] Remove more workrounds for Android that have been fixed upstream (#124176)
Issues that were fixed 10+ years ago with Bionic libc.
1 parent ee2722f commit e289cb5

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

lldb/source/Host/posix/DomainSocket.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
using namespace lldb;
2121
using namespace lldb_private;
2222

23-
#ifdef __ANDROID__
24-
// Android does not have SUN_LEN
25-
#ifndef SUN_LEN
26-
#define SUN_LEN(ptr) \
27-
(offsetof(struct sockaddr_un, sun_path) + strlen((ptr)->sun_path))
28-
#endif
29-
#endif // #ifdef __ANDROID__
30-
3123
static const int kDomain = AF_UNIX;
3224
static const int kType = SOCK_STREAM;
3325

lldb/source/Host/posix/ProcessLauncherPosixFork.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
#include <csignal>
2525
#include <sstream>
2626

27-
#ifdef __ANDROID__
28-
#define PT_TRACE_ME PTRACE_TRACEME
29-
#endif
30-
3127
#if defined(__linux__)
3228
#include <sys/personality.h>
3329
#endif

lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "ObjectContainerBSDArchive.h"
1010

11-
#if defined(_WIN32) || defined(__ANDROID__) || defined(_AIX)
11+
#if defined(_WIN32) || defined(_AIX)
1212
// Defines from ar, missing on Windows
1313
#define SARMAG 8
1414
#define ARFMAG "`\n"

0 commit comments

Comments
 (0)