diff options
| author | Dimitry Ivanov <dimitry@google.com> | 2024-04-03 15:28:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-03 15:28:49 +0000 |
| commit | a48496e399e9ce8d89a5787c2dcfdd2f73451ee4 (patch) | |
| tree | 742612eab5d6d835a3cd0e941854f823080bd2cf | |
| parent | 2e5c4c02db0cc55982c368d037aed88e7d5b6c1b (diff) | |
| parent | 86910555f1b3ecbf7745186a13c25cfb92125963 (diff) | |
| download | native_bridge_support-a48496e399e9ce8d89a5787c2dcfdd2f73451ee4.tar.gz | |
Merge "libcamera2ndk: update trampolines and libraries" into main
6 files changed, 9 insertions, 0 deletions
diff --git a/android_api/libcamera2ndk/proxy/trampolines_arm64_to_x86_64-inl.h b/android_api/libcamera2ndk/proxy/trampolines_arm64_to_x86_64-inl.h index fcf9a5c..008ee94 100644 --- a/android_api/libcamera2ndk/proxy/trampolines_arm64_to_x86_64-inl.h +++ b/android_api/libcamera2ndk/proxy/trampolines_arm64_to_x86_64-inl.h @@ -37,6 +37,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ACameraMetadata_fromCameraMetadata", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getAllTags", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getConstEntry", GetTrampolineFunc<auto(void*, uint32_t, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, +{"ACameraMetadata_getTagFromName", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_isLogicalMultiCamera", GetTrampolineFunc<auto(void*, void*, void*) -> uint8_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_create", GetTrampolineFunc<auto(void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_free", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libcamera2ndk/proxy/trampolines_arm_to_x86-inl.h b/android_api/libcamera2ndk/proxy/trampolines_arm_to_x86-inl.h index fcf9a5c..008ee94 100644 --- a/android_api/libcamera2ndk/proxy/trampolines_arm_to_x86-inl.h +++ b/android_api/libcamera2ndk/proxy/trampolines_arm_to_x86-inl.h @@ -37,6 +37,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ACameraMetadata_fromCameraMetadata", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getAllTags", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getConstEntry", GetTrampolineFunc<auto(void*, uint32_t, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, +{"ACameraMetadata_getTagFromName", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_isLogicalMultiCamera", GetTrampolineFunc<auto(void*, void*, void*) -> uint8_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_create", GetTrampolineFunc<auto(void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_free", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libcamera2ndk/proxy/trampolines_riscv64_to_x86_64-inl.h b/android_api/libcamera2ndk/proxy/trampolines_riscv64_to_x86_64-inl.h index fcf9a5c..008ee94 100644 --- a/android_api/libcamera2ndk/proxy/trampolines_riscv64_to_x86_64-inl.h +++ b/android_api/libcamera2ndk/proxy/trampolines_riscv64_to_x86_64-inl.h @@ -37,6 +37,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ACameraMetadata_fromCameraMetadata", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getAllTags", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_getConstEntry", GetTrampolineFunc<auto(void*, uint32_t, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, +{"ACameraMetadata_getTagFromName", GetTrampolineFunc<auto(void*, void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraMetadata_isLogicalMultiCamera", GetTrampolineFunc<auto(void*, void*, void*) -> uint8_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_create", GetTrampolineFunc<auto(void*, void*) -> uint32_t>(), reinterpret_cast<void*>(NULL)}, {"ACameraOutputTarget_free", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libcamera2ndk/stubs_arm.cc b/android_api/libcamera2ndk/stubs_arm.cc index cc3281a..313e165 100644 --- a/android_api/libcamera2ndk/stubs_arm.cc +++ b/android_api/libcamera2ndk/stubs_arm.cc @@ -54,6 +54,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_free); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_fromCameraMetadata); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getAllTags); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getConstEntry); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getTagFromName); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_isLogicalMultiCamera); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_create); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_free); @@ -127,6 +128,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_fromCameraMetadata); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getAllTags); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getConstEntry); + INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getTagFromName); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_isLogicalMultiCamera); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_create); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_free); diff --git a/android_api/libcamera2ndk/stubs_arm64.cc b/android_api/libcamera2ndk/stubs_arm64.cc index cc3281a..313e165 100644 --- a/android_api/libcamera2ndk/stubs_arm64.cc +++ b/android_api/libcamera2ndk/stubs_arm64.cc @@ -54,6 +54,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_free); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_fromCameraMetadata); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getAllTags); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getConstEntry); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getTagFromName); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_isLogicalMultiCamera); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_create); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_free); @@ -127,6 +128,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_fromCameraMetadata); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getAllTags); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getConstEntry); + INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getTagFromName); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_isLogicalMultiCamera); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_create); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_free); diff --git a/android_api/libcamera2ndk/stubs_riscv64.cc b/android_api/libcamera2ndk/stubs_riscv64.cc index cc3281a..313e165 100644 --- a/android_api/libcamera2ndk/stubs_riscv64.cc +++ b/android_api/libcamera2ndk/stubs_riscv64.cc @@ -54,6 +54,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_free); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_fromCameraMetadata); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getAllTags); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getConstEntry); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_getTagFromName); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraMetadata_isLogicalMultiCamera); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_create); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ACameraOutputTarget_free); @@ -127,6 +128,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_fromCameraMetadata); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getAllTags); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getConstEntry); + INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_getTagFromName); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraMetadata_isLogicalMultiCamera); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_create); INIT_INTERCEPTABLE_STUB_FUNCTION("libcamera2ndk.so", ACameraOutputTarget_free); |