diff options
| author | dimitry <dimitry@google.com> | 2024-04-03 15:55:35 +0200 |
|---|---|---|
| committer | dimitry <dimitry@google.com> | 2024-04-03 15:55:35 +0200 |
| commit | 86910555f1b3ecbf7745186a13c25cfb92125963 (patch) | |
| tree | 83f5b09714793735d19b6eff3ec7d0ef7b45c353 | |
| parent | c9f621ce7f284cc3c08aa88e99dee55bbf8702f5 (diff) | |
| download | native_bridge_support-86910555f1b3ecbf7745186a13c25cfb92125963.tar.gz | |
libcamera2ndk: update trampolines and libraries
Bug: http://b/332645649
Test: builds
Change-Id: I8e49d40fb80c9735b989cc8fe1e3c5e27dcf1759
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); |