android: Fix hooking art_quick_resolution_trampoline (#307)

When using --enable-optimizations on newer ARTs, the quick entrypoint= can be art_quick_resolution_trampoline. Fixes #306.
frida · Feb 13, 2024 · 0aea1c6 · 0aea1c6
1 parent aae6012
commit 0aea1c6
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/android.js b/lib/android.js
@@ -483,6 +483,7 @@ function _getApi () {
 
     temporaryApi.artQuickGenericJniTrampoline = getArtQuickEntrypointFromTrampoline(quickGenericJniTrampoline, vm);
     temporaryApi.artQuickToInterpreterBridge = getArtQuickEntrypointFromTrampoline(quickToInterpreterBridgeTrampoline, vm);
+    temporaryApi.artQuickResolutionTrampoline = getArtQuickEntrypointFromTrampoline(quickResolutionTrampoline, vm);
 
     if (temporaryApi['art::JavaVMExt::AddGlobalRef'] === undefined) {
       temporaryApi['art::JavaVMExt::AddGlobalRef'] = makeAddGlobalRefFallbackForAndroid5(temporaryApi);
@@ -1825,7 +1826,8 @@ function instrumentArtQuickEntrypoints (vm) {
   // Entrypoints that dispatch method invocation from the quick ABI.
   const quickEntrypoints = [
     api.artQuickGenericJniTrampoline,
-    api.artQuickToInterpreterBridge
+    api.artQuickToInterpreterBridge,
+    api.artQuickResolutionTrampoline
   ];
 
   quickEntrypoints.forEach(entrypoint => {