generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Look into local group on dlsym with RTLD_DEFAULT

Browse Source 
Fix dlsym to look into local group when called with
  RTLD_DEFAULT and RTLD_NEXT.

Bug: 17512583
Change-Id: I541354e89539c712af2ea4ec751e546913027084
This commit is contained in:
Dmitriy Ivanov
2015-04-01 14:45:10 -07:00
parent ab7c79e22e
commit 76ac1acdac
6 changed files with 100 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/libs/Android.mk
View File

@@ -370,6 +370,15 @@ libtest_dlsym_weak_func_src_files := \
module := libtest_dlsym_weak_func
include $(LOCAL_PATH)/Android.build.testlib.mk
# -----------------------------------------------------------------------------
# Library to check RTLD_LOCAL with dlsym in 'this'
# -----------------------------------------------------------------------------
libtest_dlsym_from_this_src_files := dlsym_from_this.cpp
module := libtest_dlsym_from_this
include $(LOCAL_PATH)/Android.build.testlib.mk
# -----------------------------------------------------------------------------
# Library with weak undefined function
# -----------------------------------------------------------------------------

30
tests/libs/dlsym_from_this.cpp Normal file
View File

@@ -0,0 +1,30 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <dlfcn.h>
#include <stdio.h>
int test_dlsym_symbol = 42;
extern "C" int* lookup_dlsym_symbol_using_RTLD_DEFAULT() {
dlerror();
int* result = static_cast<int*>(dlsym(RTLD_DEFAULT, "test_dlsym_symbol"));
// TODO: remove this once b/20049306 is fixed
if (result == nullptr) {
printf("Cannot find the answer\n");
}
return result;
}