diff options
author | dimitry <dimitry@google.com> | 2024-04-12 20:54:47 +0200 |
---|---|---|
committer | dimitry <dimitry@google.com> | 2024-04-12 22:17:03 +0200 |
commit | e32ddc9ed10d2e42d1c8b3b0eb630467dd014d3a (patch) | |
tree | d1cd87a00514f6b4f6e4f111d5f9914257158e9b | |
parent | 3470cf8e2dafe1d648cf941131fd76ae1cca864a (diff) | |
download | native_bridge_support-e32ddc9ed10d2e42d1c8b3b0eb630467dd014d3a.tar.gz |
Update libandroid stubs and proxies
Test: builds
Bug: http://b/333794229
Change-Id: I8c72efe83d95039f8b2cfadc45bca06582569173
9 files changed, 141 insertions, 0 deletions
diff --git a/android_api/libandroid/proxy/custom_trampolines_arm64_to_x86_64.json b/android_api/libandroid/proxy/custom_trampolines_arm64_to_x86_64.json index ceece83..5c5c3c3 100644 --- a/android_api/libandroid/proxy/custom_trampolines_arm64_to_x86_64.json +++ b/android_api/libandroid/proxy/custom_trampolines_arm64_to_x86_64.json @@ -69,6 +69,12 @@ "reason_for_compatible": [ "_JNIEnv is made on x86 side is passed to x86 libandroid_runtime without changes" ] + }, + "struct AInputReceiverCallbacks*": { + "force_compatible": true, + "reason_for_compatible": [ + "It's opaque structure in public API (used as a handle)" + ] } } } diff --git a/android_api/libandroid/proxy/custom_trampolines_arm_to_x86.json b/android_api/libandroid/proxy/custom_trampolines_arm_to_x86.json index c757677..13d79f1 100644 --- a/android_api/libandroid/proxy/custom_trampolines_arm_to_x86.json +++ b/android_api/libandroid/proxy/custom_trampolines_arm_to_x86.json @@ -87,6 +87,18 @@ "reason_for_compatible": [ "_JNIEnv is made on x86 side is passed to x86 libandroid_runtime without changes" ] + }, + "struct APerformanceHintManager*": { + "force_compatible": true, + "reason_for_compatible": [ + "It's opaque structure in public API" + ] + }, + "struct AInputReceiverCallbacks*": { + "force_compatible": true, + "reason_for_compatible": [ + "It's opaque structure in public API (used as a handle)" + ] } } } diff --git a/android_api/libandroid/proxy/custom_trampolines_riscv64_to_x86_64.json b/android_api/libandroid/proxy/custom_trampolines_riscv64_to_x86_64.json index ceece83..5c5c3c3 100644 --- a/android_api/libandroid/proxy/custom_trampolines_riscv64_to_x86_64.json +++ b/android_api/libandroid/proxy/custom_trampolines_riscv64_to_x86_64.json @@ -69,6 +69,12 @@ "reason_for_compatible": [ "_JNIEnv is made on x86 side is passed to x86 libandroid_runtime without changes" ] + }, + "struct AInputReceiverCallbacks*": { + "force_compatible": true, + "reason_for_compatible": [ + "It's opaque structure in public API (used as a handle)" + ] } } } diff --git a/android_api/libandroid/proxy/trampolines_arm64_to_x86_64-inl.h b/android_api/libandroid/proxy/trampolines_arm64_to_x86_64-inl.h index b775873..46f7c59 100644 --- a/android_api/libandroid/proxy/trampolines_arm64_to_x86_64-inl.h +++ b/android_api/libandroid/proxy/trampolines_arm64_to_x86_64-inl.h @@ -120,6 +120,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputEvent_getSource", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_getType", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputEvent_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_attachLooper", DoCustomTrampoline_AInputQueue_attachLooper, reinterpret_cast<void*>(DoBadThunk)}, {"AInputQueue_detachLooper", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_finishEvent", GetTrampolineFunc<auto(void*, void*, int32_t) -> void>(), reinterpret_cast<void*>(NULL)}, @@ -127,6 +128,17 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputQueue_getEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_hasEvents", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_preDispatchEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_create", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setKeyEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setMotionEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createBatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createUnbatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_getInputTransferToken", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getAction", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getDownTime", GetTrampolineFunc<auto(void*) -> int64_t>(), reinterpret_cast<void*>(NULL)}, @@ -301,6 +313,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ASurfaceTransaction_setColor", GetTrampolineFunc<auto(void*, void*, float, float, float, float, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setCrop", GetTrampolineFunc<auto(void*, void*, void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDamageRegion", GetTrampolineFunc<auto(void*, void*, void*, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"ASurfaceTransaction_setDesiredHdrHeadroom", GetTrampolineFunc<auto(void*, void*, float) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDesiredPresentTime", GetTrampolineFunc<auto(void*, int64_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setEnableBackPressure", GetTrampolineFunc<auto(void*, void*, uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setExtendedRangeBrightness", GetTrampolineFunc<auto(void*, void*, float, float) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libandroid/proxy/trampolines_arm_to_x86-inl.h b/android_api/libandroid/proxy/trampolines_arm_to_x86-inl.h index 8272ec8..d449ad5 100644 --- a/android_api/libandroid/proxy/trampolines_arm_to_x86-inl.h +++ b/android_api/libandroid/proxy/trampolines_arm_to_x86-inl.h @@ -120,6 +120,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputEvent_getSource", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_getType", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputEvent_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_attachLooper", DoCustomTrampoline_AInputQueue_attachLooper, reinterpret_cast<void*>(DoBadThunk)}, {"AInputQueue_detachLooper", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_finishEvent", GetTrampolineFunc<auto(void*, void*, int32_t) -> void>(), reinterpret_cast<void*>(NULL)}, @@ -127,6 +128,17 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputQueue_getEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_hasEvents", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_preDispatchEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_create", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setKeyEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setMotionEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createBatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createUnbatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_getInputTransferToken", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getAction", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getDownTime", GetTrampolineFunc<auto(void*) -> int64_t>(), reinterpret_cast<void*>(NULL)}, @@ -301,6 +313,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ASurfaceTransaction_setColor", GetTrampolineFunc<auto(void*, void*, float, float, float, float, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setCrop", GetTrampolineFunc<auto(void*, void*, void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDamageRegion", GetTrampolineFunc<auto(void*, void*, void*, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"ASurfaceTransaction_setDesiredHdrHeadroom", GetTrampolineFunc<auto(void*, void*, float) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDesiredPresentTime", GetTrampolineFunc<auto(void*, int64_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setEnableBackPressure", GetTrampolineFunc<auto(void*, void*, uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setExtendedRangeBrightness", GetTrampolineFunc<auto(void*, void*, float, float) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libandroid/proxy/trampolines_riscv64_to_x86_64-inl.h b/android_api/libandroid/proxy/trampolines_riscv64_to_x86_64-inl.h index b775873..46f7c59 100644 --- a/android_api/libandroid/proxy/trampolines_riscv64_to_x86_64-inl.h +++ b/android_api/libandroid/proxy/trampolines_riscv64_to_x86_64-inl.h @@ -120,6 +120,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputEvent_getSource", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_getType", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputEvent_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputEvent_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_attachLooper", DoCustomTrampoline_AInputQueue_attachLooper, reinterpret_cast<void*>(DoBadThunk)}, {"AInputQueue_detachLooper", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_finishEvent", GetTrampolineFunc<auto(void*, void*, int32_t) -> void>(), reinterpret_cast<void*>(NULL)}, @@ -127,6 +128,17 @@ const KnownTrampoline kKnownTrampolines[] = { {"AInputQueue_getEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_hasEvents", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AInputQueue_preDispatchEvent", GetTrampolineFunc<auto(void*, void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_create", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setKeyEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiverCallbacks_setMotionEventCallback", GetTrampolineFunc<auto(void*, auto(*)(void*, void*) -> uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createBatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_createUnbatchedInputReceiver", GetTrampolineFunc<auto(void*, void*, void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_getInputTransferToken", GetTrampolineFunc<auto(void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputReceiver_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_release", GetTrampolineFunc<auto(void*) -> void>(), reinterpret_cast<void*>(NULL)}, +{"AInputTransferToken_toJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_fromJava", GetTrampolineFunc<auto(void*, void*) -> void*>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getAction", GetTrampolineFunc<auto(void*) -> int32_t>(), reinterpret_cast<void*>(NULL)}, {"AKeyEvent_getDownTime", GetTrampolineFunc<auto(void*) -> int64_t>(), reinterpret_cast<void*>(NULL)}, @@ -301,6 +313,7 @@ const KnownTrampoline kKnownTrampolines[] = { {"ASurfaceTransaction_setColor", GetTrampolineFunc<auto(void*, void*, float, float, float, float, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setCrop", GetTrampolineFunc<auto(void*, void*, void*) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDamageRegion", GetTrampolineFunc<auto(void*, void*, void*, uint32_t) -> void>(), reinterpret_cast<void*>(NULL)}, +{"ASurfaceTransaction_setDesiredHdrHeadroom", GetTrampolineFunc<auto(void*, void*, float) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setDesiredPresentTime", GetTrampolineFunc<auto(void*, int64_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setEnableBackPressure", GetTrampolineFunc<auto(void*, void*, uint8_t) -> void>(), reinterpret_cast<void*>(NULL)}, {"ASurfaceTransaction_setExtendedRangeBrightness", GetTrampolineFunc<auto(void*, void*, float, float) -> void>(), reinterpret_cast<void*>(NULL)}, diff --git a/android_api/libandroid/stubs_arm.cc b/android_api/libandroid/stubs_arm.cc index 924b16c..8801e34 100644 --- a/android_api/libandroid/stubs_arm.cc +++ b/android_api/libandroid/stubs_arm.cc @@ -137,6 +137,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getDeviceId); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getSource); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getType); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_attachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_detachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_finishEvent); @@ -144,6 +145,17 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_getEvent); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_hasEvents); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_preDispatchEvent); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_create); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setKeyEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setMotionEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createBatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createUnbatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_getInputTransferToken); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_fromJava); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getAction); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getDownTime); @@ -318,6 +330,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setBufferTransparency); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setColor); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setCrop); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDamageRegion); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredHdrHeadroom); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredPresentTime); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setEnableBackPressure); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setExtendedRangeBrightness); @@ -491,6 +504,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getSource); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getType); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_attachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_detachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_finishEvent); @@ -498,6 +512,17 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_getEvent); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_hasEvents); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_preDispatchEvent); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_create); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setKeyEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setMotionEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createBatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createUnbatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_getInputTransferToken); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_fromJava); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_fromJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getAction); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getDownTime); @@ -672,6 +697,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setColor); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setCrop); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDamageRegion); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredHdrHeadroom); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredPresentTime); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setEnableBackPressure); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setExtendedRangeBrightness); diff --git a/android_api/libandroid/stubs_arm64.cc b/android_api/libandroid/stubs_arm64.cc index 924b16c..8801e34 100644 --- a/android_api/libandroid/stubs_arm64.cc +++ b/android_api/libandroid/stubs_arm64.cc @@ -137,6 +137,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getDeviceId); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getSource); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getType); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_attachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_detachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_finishEvent); @@ -144,6 +145,17 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_getEvent); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_hasEvents); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_preDispatchEvent); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_create); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setKeyEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setMotionEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createBatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createUnbatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_getInputTransferToken); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_fromJava); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getAction); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getDownTime); @@ -318,6 +330,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setBufferTransparency); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setColor); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setCrop); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDamageRegion); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredHdrHeadroom); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredPresentTime); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setEnableBackPressure); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setExtendedRangeBrightness); @@ -491,6 +504,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getSource); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getType); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_attachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_detachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_finishEvent); @@ -498,6 +512,17 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_getEvent); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_hasEvents); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_preDispatchEvent); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_create); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setKeyEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setMotionEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createBatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createUnbatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_getInputTransferToken); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_fromJava); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_fromJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getAction); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getDownTime); @@ -672,6 +697,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setColor); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setCrop); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDamageRegion); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredHdrHeadroom); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredPresentTime); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setEnableBackPressure); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setExtendedRangeBrightness); diff --git a/android_api/libandroid/stubs_riscv64.cc b/android_api/libandroid/stubs_riscv64.cc index 924b16c..8801e34 100644 --- a/android_api/libandroid/stubs_riscv64.cc +++ b/android_api/libandroid/stubs_riscv64.cc @@ -137,6 +137,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getDeviceId); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getSource); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_getType); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputEvent_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_attachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_detachLooper); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_finishEvent); @@ -144,6 +145,17 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_getEvent); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_hasEvents); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputQueue_preDispatchEvent); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_create); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setKeyEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiverCallbacks_setMotionEventCallback); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createBatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_createUnbatchedInputReceiver); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_getInputTransferToken); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputReceiver_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_fromJava); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_release); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(AInputTransferToken_toJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_fromJava); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getAction); DEFINE_INTERCEPTABLE_STUB_FUNCTION(AKeyEvent_getDownTime); @@ -318,6 +330,7 @@ DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setBufferTransparency); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setColor); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setCrop); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDamageRegion); +DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredHdrHeadroom); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setDesiredPresentTime); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setEnableBackPressure); DEFINE_INTERCEPTABLE_STUB_FUNCTION(ASurfaceTransaction_setExtendedRangeBrightness); @@ -491,6 +504,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getSource); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_getType); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputEvent_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_attachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_detachLooper); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_finishEvent); @@ -498,6 +512,17 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_getEvent); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_hasEvents); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputQueue_preDispatchEvent); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_create); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setKeyEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiverCallbacks_setMotionEventCallback); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createBatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_createUnbatchedInputReceiver); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_getInputTransferToken); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputReceiver_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_fromJava); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_release); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AInputTransferToken_toJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_fromJava); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getAction); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", AKeyEvent_getDownTime); @@ -672,6 +697,7 @@ static void __attribute__((constructor(0))) init_stub_library() { INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setColor); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setCrop); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDamageRegion); + INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredHdrHeadroom); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setDesiredPresentTime); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setEnableBackPressure); INIT_INTERCEPTABLE_STUB_FUNCTION("libandroid.so", ASurfaceTransaction_setExtendedRangeBrightness); |