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

Merge "Add support of architecture specific ld.configs"

Browse source
This commit is contained in:
Dimitry Ivanov 2017-08-24 09:38:33 +00:00 committed by Gerrit Code Review
commit 506f3f11f1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linker/linker.cpp
View file

@ -66,6 +66,7 @@
#include "linker_reloc_iterators.h"
#include "linker_utils.h"
#include "android-base/macros.h"
#include "android-base/strings.h"
#include "android-base/stringprintf.h"
#include "ziparchive/zip_archive.h"
@ -83,6 +84,8 @@ static LinkerTypeAllocator<LinkedListEntry<soinfo>> g_soinfo_links_allocator;
static LinkerTypeAllocator<android_namespace_t> g_namespace_allocator;
static LinkerTypeAllocator<LinkedListEntry<android_namespace_t>> g_namespace_list_allocator;
static const char* const kLdConfigArchFilePath = "/system/etc/ld.config." ABI_STRING ".txt";
static const char* const kLdConfigFilePath = "/system/etc/ld.config.txt";
#if defined(__LP64__)
@ -3467,7 +3470,7 @@ std::vector<android_namespace_t*> init_default_namespaces(const char* executable
std::string error_msg;
const char* config_file = kLdConfigFilePath;
const char* config_file = file_exists(kLdConfigArchFilePath) ? kLdConfigArchFilePath : kLdConfigFilePath;
#ifdef USE_LD_CONFIG_FILE
// This is a debugging/testing only feature. Must not be available on
// production builds.