diff options
| author | Sijie Chen <sijiec@google.com> | 2024-01-12 21:25:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-12 21:25:46 +0000 |
| commit | 30ea27ab11548653d5ce671a76fefca8ce29a0d0 (patch) | |
| tree | c91a0434a06ba9c0096f256791ab14ad237c38d8 | |
| parent | 2acd1c6bce8a6d13b60c1caf5cb63a954afb5de1 (diff) | |
| parent | 49116642d6f8e39e3ace9245beb39c4d00936d07 (diff) | |
| download | native_bridge_support-30ea27ab11548653d5ce671a76fefca8ce29a0d0.tar.gz | |
[Berberis] Code clean up am: 00675ce72b am: 49116642d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/native_bridge_support/+/2908697
Change-Id: I1e3f3ae5c0c4c8f47e16a31fd6e6fcb27be9eed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libc/proxy/trampolines_arm64_to_x86_64-inl.h | 3 | ||||
| -rw-r--r-- | libc/proxy/trampolines_arm_to_x86-inl.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libc/proxy/trampolines_arm64_to_x86_64-inl.h b/libc/proxy/trampolines_arm64_to_x86_64-inl.h index ad316dc..8b5ab35 100644 --- a/libc/proxy/trampolines_arm64_to_x86_64-inl.h +++ b/libc/proxy/trampolines_arm64_to_x86_64-inl.h @@ -36,6 +36,9 @@ const KnownTrampoline kKnownTrampolines[] = { {"getnameinfo", GetTrampolineFunc<auto(void*, int32_t, void*, int32_t, void*, int32_t, int32_t) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"gettimeofday", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"longjmp", GetTrampolineFunc<auto(void*, int32_t) -> void>(), reinterpret_cast<void*>(DoThunk_longjmp)}, +{"memcmp", GetTrampolineFunc<auto(void*, void*, int32_t) -> int32_t>(), reinterpret_cast<void*>(NULL)}, +{"memcpy", GetTrampolineFunc<auto(void*, void*, int32_t) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"memset", GetTrampolineFunc<auto(void*, int32_t, int32_t) -> void*>(), reinterpret_cast<void*>(NULL)}, {"native_bridge___cxa_thread_atexit_impl", DoCustomTrampoline_native_bridge___cxa_thread_atexit_impl, reinterpret_cast<void*>(DoBadThunk)}, {"native_bridge_aligned_alloc", GetTrampolineFunc<auto(size_t, size_t) -> void*>(), reinterpret_cast<void*>(aligned_alloc)}, {"native_bridge_calloc", GetTrampolineFunc<auto(size_t, size_t) -> void*>(), reinterpret_cast<void*>(calloc)}, diff --git a/libc/proxy/trampolines_arm_to_x86-inl.h b/libc/proxy/trampolines_arm_to_x86-inl.h index 8d1d5c7..965b760 100644 --- a/libc/proxy/trampolines_arm_to_x86-inl.h +++ b/libc/proxy/trampolines_arm_to_x86-inl.h @@ -33,6 +33,9 @@ const KnownTrampoline kKnownTrampolines[] = { {"gethostbyname", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"getnameinfo", GetTrampolineFunc<auto(void*, int32_t, void*, int32_t, void*, int32_t, int32_t) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"longjmp", GetTrampolineFunc<auto(void*, int32_t) -> void>(), reinterpret_cast<void*>(DoThunk_longjmp)}, +{"memcmp", GetTrampolineFunc<auto(void*, void*, int32_t) -> int32_t>(), reinterpret_cast<void*>(NULL)}, +{"memcpy", GetTrampolineFunc<auto(void*, void*, int32_t) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"memset", GetTrampolineFunc<auto(void*, int32_t, int32_t) -> void*>(), reinterpret_cast<void*>(NULL)}, {"native_bridge___cxa_thread_atexit_impl", DoCustomTrampoline_native_bridge___cxa_thread_atexit_impl, reinterpret_cast<void*>(DoBadThunk)}, {"native_bridge_aligned_alloc", GetTrampolineFunc<auto(size_t, size_t) -> void*>(), reinterpret_cast<void*>(aligned_alloc)}, {"native_bridge_calloc", GetTrampolineFunc<auto(size_t, size_t) -> void*>(), reinterpret_cast<void*>(calloc)}, |