Skip to content

[lldb] Remove more workrounds for Android that have been fixed upstream #124176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brad0 merged 1 commit into from
Jan 24, 2025
Merged

[lldb] Remove more workrounds for Android that have been fixed upstream #124176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions lldb/source/Host/posix/DomainSocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,6 @@
using namespace lldb;
using namespace lldb_private;

#ifdef __ANDROID__
// Android does not have SUN_LEN
#ifndef SUN_LEN
#define SUN_LEN(ptr) \
(offsetof(struct sockaddr_un, sun_path) + strlen((ptr)->sun_path))
#endif
#endif // #ifdef __ANDROID__

static const int kDomain = AF_UNIX;
static const int kType = SOCK_STREAM;

Expand Down
4 changes: 0 additions & 4 deletions lldb/source/Host/posix/ProcessLauncherPosixFork.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
#include <csignal>
#include <sstream>

#ifdef __ANDROID__
#define PT_TRACE_ME PTRACE_TRACEME
#endif

#if defined(__linux__)
#include <sys/personality.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "ObjectContainerBSDArchive.h"

#if defined(_WIN32) || defined(__ANDROID__) || defined(_AIX)
#if defined(_WIN32) || defined(_AIX)
// Defines from ar, missing on Windows
#define SARMAG 8
#define ARFMAG "`\n"
Expand Down
Loading