tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove explicit lists of ABIs."

Browse source
This commit is contained in:
Treehugger Robot 2022-10-19 18:08:17 +00:00 committed by Gerrit Code Review
commit f2be65d0f7
2 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/dl_test.cpp
View file

@ -32,9 +32,10 @@
#include <regex>
#include <string>
#include "gtest_globals.h"
#include <android-base/file.h>
#include <android-base/macros.h>
#include <android-base/test_utils.h>
#include "gtest_globals.h"
#include "utils.h"
extern "C" int main_global_default_serial() {
@ -84,22 +85,13 @@ TEST(dl, lib_does_not_preempt_global_protected) {
#if defined(__BIONIC__)
#if defined(__LP64__)
static constexpr const char* kPathToLinker = "/system/bin/linker64";
#define LINKER_NAME "linker64"
#else
static constexpr const char* kPathToLinker = "/system/bin/linker";
#endif
#if defined (__aarch64__)
static constexpr const char* kAlternatePathToLinker = "/system/bin/arm64/linker64";
#elif defined (__arm__)
static constexpr const char* kAlternatePathToLinker = "/system/bin/arm/linker";
#elif defined (__x86_64__)
static constexpr const char* kAlternatePathToLinker = "/system/bin/x86_64/linker64";
#elif defined (__i386__)
static constexpr const char* kAlternatePathToLinker = "/system/bin/x86/linker";
#else
#error "Unknown architecture"
#define LINKER_NAME "linker"
#endif
static constexpr const char* kPathToLinker = "/system/bin/" LINKER_NAME;
static constexpr const char* kAlternatePathToLinker = "/system/bin/" ABI_STRING "/" LINKER_NAME;
#undef LINKER_NAME
const char* PathToLinker() {
// On the systems with emulated architecture linker would be of different

13
tests/dlfcn_test.cpp
View file

@ -33,6 +33,7 @@
#include <thread>
#include <android-base/file.h>
#include <android-base/macros.h>
#include <android-base/scopeguard.h>
#include "gtest_globals.h"
@ -966,17 +967,7 @@ TEST(dlfcn, dlopen_executable_by_absolute_path) {
#endif
}
#if defined (__aarch64__)
#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/arm64/"
#elif defined (__arm__)
#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/arm/"
#elif defined (__i386__)
#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib/x86/"
#elif defined (__x86_64__)
#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/x86_64/"
#else
#error "Unknown architecture"
#endif
#define ALTERNATE_PATH_TO_SYSTEM_LIB "/system/lib64/" ABI_STRING "/"
#define PATH_TO_LIBC PATH_TO_SYSTEM_LIB "libc.so"
#define PATH_TO_BOOTSTRAP_LIBC PATH_TO_SYSTEM_LIB "bootstrap/libc.so"
#define ALTERNATE_PATH_TO_LIBC ALTERNATE_PATH_TO_SYSTEM_LIB "libc.so"