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

Merge "Revert "linker: disable ld.config.txt in ASAN mode""

Browse source 
am: 3e8584d4a7

Change-Id: Ibd59bae623157bfddc6f57514a2bfca5dedba065
This commit is contained in:
Jiyong Park 2017-10-04 00:44:09 +00:00 committed by android-build-merger
commit 5a437c52b7
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
linker/linker_config.cpp
View file

@ -375,15 +375,6 @@ bool Config::read_binary_config(const char* ld_config_file_path,
bool is_asan,
const Config** config,
std::string* error_msg) {
// TODO(b/38114603) Currently, multiple namespaces does not support ASAN mode
// where some symbols should be intercepted via LD_PRELOAD; LD_PRELOADed libs
// are not being preloaded into the linked namespaces other than the default
// namespace. Until we fix the problem, we temporarily disable ld.config.txt
// in ASAN mode.
if (is_asan) {
return false;
}
g_config.clear();
std::unordered_map<std::string, PropertyValue> property_map;

7
linker/tests/linker_config_test.cpp
View file

@ -168,7 +168,6 @@ TEST(linker_config, smoke) {
run_linker_config_smoke_test(false);
}
// TODO(b/38114603) revive this test when ld.config.txt is enabled for ASAN mode
//TEST(linker_config, asan_smoke) {
// run_linker_config_smoke_test(true);
//}
TEST(linker_config, asan_smoke) {
run_linker_config_smoke_test(true);
}