Skip to content

add support for avd emulator #36

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for avd emulator #36

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
2 changes: 1 addition & 1 deletion xdl/src/main/cpp/xdl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ static xdl_t *xdl_find(const char *filename) {
// from auxv (linker, vDSO)
xdl_t *self = NULL;
if (xdl_util_ends_with(filename, XDL_UTIL_LINKER_BASENAME))
self = xdl_find_from_auxv(AT_BASE, XDL_UTIL_LINKER_PATHNAME);
self = xdl_find_from_auxv(AT_BASE, xdl_get_linker_path());
else if (xdl_util_ends_with(filename, XDL_UTIL_VDSO_BASENAME))
self = xdl_find_from_auxv(AT_SYSINFO_EHDR, XDL_UTIL_VDSO_BASENAME);

Expand Down
2 changes: 1 addition & 1 deletion xdl/src/main/cpp/xdl_iterate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static int xdl_iterate_by_linker(xdl_iterate_phdr_cb_t cb, void *cb_arg, int fla
uintptr_t linker_base = xdl_iterate_get_linker_base();
if (0 != linker_base) {
if (0 !=
(r = xdl_iterate_do_callback(cb, cb_arg, linker_base, XDL_UTIL_LINKER_PATHNAME, &linker_load_bias)))
(r = xdl_iterate_do_callback(cb, cb_arg, linker_base, xdl_get_linker_path(), &linker_load_bias)))
return r;
}

Expand Down
15 changes: 15 additions & 0 deletions xdl/src/main/cpp/xdl_linker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,3 +229,18 @@ void *xdl_linker_force_dlopen(const char *filename) {
return handle;
}
}

const char* xdl_get_linker_path(void) {
#if defined(__arm__)
struct stat st;
if (stat("/system/lib/libndk_translation.so", &st) == 0)
return XDL_UTIL_LINKER_PATHNAME_ARM;
else
#elif defined(__aarch64__)
struct stat st;
if (stat("/system/lib64/libndk_translation.so", &st) == 0)
return XDL_UTIL_LINKER_PATHNAME_ARM;
else
#endif
return XDL_UTIL_LINKER_PATHNAME;
}
2 changes: 2 additions & 0 deletions xdl/src/main/cpp/xdl_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
#ifndef __LP64__
#define XDL_UTIL_LINKER_BASENAME "linker"
#define XDL_UTIL_LINKER_PATHNAME "/system/bin/linker"
#define XDL_UTIL_LINKER_PATHNAME_ARM "/system/bin/arm/linker"
#define XDL_UTIL_APP_PROCESS_BASENAME "app_process32"
#define XDL_UTIL_APP_PROCESS_PATHNAME "/system/bin/app_process32"
#define XDL_UTIL_APP_PROCESS_BASENAME_K "app_process"
#define XDL_UTIL_APP_PROCESS_PATHNAME_K "/system/bin/app_process"
#else
#define XDL_UTIL_LINKER_BASENAME "linker64"
#define XDL_UTIL_LINKER_PATHNAME "/system/bin/linker64"
#define XDL_UTIL_LINKER_PATHNAME_ARM "/system/bin/arm64/linker"
#define XDL_UTIL_APP_PROCESS_BASENAME "app_process64"
#define XDL_UTIL_APP_PROCESS_PATHNAME "/system/bin/app_process64"
#endif
Expand Down