Skip to content

In case of Android, give warning only and return the empty sectionInfo. #11615

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
merged 1 commit into from
Aug 30, 2017
Merged

In case of Android, give warning only and return the empty sectionInfo. #11615

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
11 changes: 11 additions & 0 deletions stdlib/public/runtime/ImageInspectionELF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
#include <link.h>
#include <string.h>

#if defined(__ANDROID__)
#include "llvm/ADT/StringRef.h"
#endif

using namespace swift;

/// The symbol name in the image that identifies the beginning of the
Expand Down Expand Up @@ -68,6 +72,13 @@ static SectionInfo getSectionInfo(const char *imageName,
SectionInfo sectionInfo = { 0, nullptr };
void *handle = dlopen(imageName, RTLD_LAZY | RTLD_NOLOAD);
if (!handle) {
#ifdef __ANDROID__
llvm::StringRef imagePath = llvm::StringRef(imageName);
if (imagePath.startswith("/system/lib") ||
(imageName && !imagePath.endswith(".so"))) {
return sectionInfo;
}
#endif
fatalError(/* flags = */ 0, "dlopen() failed on `%s': %s", imageName,
dlerror());
}
Expand Down