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

Merge changes Iba5f74e1,I92b88939

Browse source 
* changes:
  Fix CtsJniTestCases
  Fix formatting
This commit is contained in:
Treehugger Robot 2019-04-05 18:31:25 +00:00 committed by Gerrit Code Review
commit d1ff49c24a
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libdl/libdl.cpp
View file

@ -24,6 +24,9 @@
extern "C" {
__attribute__((__weak__, visibility("default")))
void __loader_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size);
__attribute__((__weak__, visibility("default")))
void* __loader_dlopen(const char* filename, int flags, const void* caller_addr);
@ -70,6 +73,11 @@ __attribute__((__weak__, visibility("default")))
int __loader_android_get_application_target_sdk_version();
// Proxy calls to bionic loader
__attribute__((__weak__))
void android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size) {
__loader_android_get_LD_LIBRARY_PATH(buffer, buffer_size);
}
__attribute__((__weak__))
void* dlopen(const char* filename, int flag) {
const void* caller_addr = __builtin_return_address(0);

1
libdl/libdl.map.txt
View file

@ -43,5 +43,6 @@ LIBC_OMR1 { # introduced=27
LIBC_PLATFORM {
global:
android_get_LD_LIBRARY_PATH;
__cfi_init;
} LIBC_OMR1;

2
libdl/libdl_android.cpp
View file

@ -28,7 +28,7 @@ __attribute__((__weak__, visibility("default")))
void __loader_android_get_LD_LIBRARY_PATH(char* buffer, size_t buffer_size);
__attribute__((__weak__, visibility("default")))
void __loader_android_update_LD_LIBRARY_PATH(const char* ld_library_path);
void __loader_android_update_LD_LIBRARY_PATH(const char* ld_library_path);
__attribute__((__weak__, visibility("default")))
void __loader_android_set_application_target_sdk_version(int target);