Merge changes Iba5f74e1,I92b88939
* changes: Fix CtsJniTestCases Fix formatting
This commit is contained in:
commit
d1ff49c24a
3 changed files with 10 additions and 1 deletions
|
@ -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);
|
||||
|
|
|
@ -43,5 +43,6 @@ LIBC_OMR1 { # introduced=27
|
|||
|
||||
LIBC_PLATFORM {
|
||||
global:
|
||||
android_get_LD_LIBRARY_PATH;
|
||||
__cfi_init;
|
||||
} LIBC_OMR1;
|
||||
|
|
Loading…
Reference in a new issue