diff options
| author | Victor Khimenko <khim@google.com> | 2020-10-22 12:22:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-22 12:22:31 +0000 |
| commit | 317ab74b79a128830028b0cd05b359d51e7e42f0 (patch) | |
| tree | 27e3b528fb95d2be40f0ca1bacf2d283ff3717d1 | |
| parent | 9d0c5a8387fdd84c15b4f15e8b339319f55b91aa (diff) | |
| parent | 4f6335710b68c46a3293f9db7dc8335df1d8f9f6 (diff) | |
| download | native_bridge_support-317ab74b79a128830028b0cd05b359d51e7e42f0.tar.gz | |
2020-10-22: merge master to rvc-d1-dev-plus-aosp am: 4f6335710b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/12886094
Change-Id: I3de27f69d83983a853dc0cc272daf9e833626133
| -rw-r--r-- | overriding/libc/stubs_arm.cpp | 6 | ||||
| -rw-r--r-- | overriding/libc/stubs_arm64.cpp | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/overriding/libc/stubs_arm.cpp b/overriding/libc/stubs_arm.cpp index 3e6f7ff..d5a798a 100644 --- a/overriding/libc/stubs_arm.cpp +++ b/overriding/libc/stubs_arm.cpp @@ -46,6 +46,9 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_set_abort_message); DEFINE_INTERCEPTABLE_STUB_FUNCTION(freeaddrinfo); DEFINE_INTERCEPTABLE_STUB_FUNCTION(gai_strerror); DEFINE_INTERCEPTABLE_STUB_FUNCTION(getaddrinfo); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(gethostbyaddr); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(gethostbyname); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(getnameinfo); DEFINE_INTERCEPTABLE_STUB_FUNCTION(longjmp); DEFINE_INTERCEPTABLE_STUB_FUNCTION(native_bridge___cxa_thread_atexit_impl); DEFINE_INTERCEPTABLE_STUB_FUNCTION(native_bridge_aligned_alloc); @@ -136,6 +139,9 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", freeaddrinfo); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gai_strerror); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getaddrinfo); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gethostbyaddr); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gethostbyname); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getnameinfo); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", longjmp); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", native_bridge___cxa_thread_atexit_impl); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", native_bridge_aligned_alloc); diff --git a/overriding/libc/stubs_arm64.cpp b/overriding/libc/stubs_arm64.cpp index 0a902f8..8e15822 100644 --- a/overriding/libc/stubs_arm64.cpp +++ b/overriding/libc/stubs_arm64.cpp @@ -46,6 +46,9 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_set_abort_message); DEFINE_INTERCEPTABLE_STUB_FUNCTION(freeaddrinfo); DEFINE_INTERCEPTABLE_STUB_FUNCTION(gai_strerror); DEFINE_INTERCEPTABLE_STUB_FUNCTION(getaddrinfo); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(gethostbyaddr); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(gethostbyname); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(getnameinfo); DEFINE_INTERCEPTABLE_STUB_FUNCTION(longjmp); DEFINE_INTERCEPTABLE_STUB_FUNCTION(native_bridge___cxa_thread_atexit_impl); DEFINE_INTERCEPTABLE_STUB_FUNCTION(native_bridge_aligned_alloc); @@ -134,6 +137,9 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", freeaddrinfo); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gai_strerror); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getaddrinfo); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gethostbyaddr); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gethostbyname); + INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getnameinfo); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", longjmp); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", native_bridge___cxa_thread_atexit_impl); INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", native_bridge_aligned_alloc); |