admin/Florida
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compatibility with Frida v16.5.7 & v16.5.8-dev (#14)

Browse Source
This commit is contained in:
Dream
2024-12-10 10:24:15 +08:00
committed by GitHub
parent 9172e84ad3
commit fbfa3e3781
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@@ -90,14 +90,14 @@ jobs:
if: needs.check_version.outputs.ALREADY_RELEASE != '1' if: needs.check_version.outputs.ALREADY_RELEASE != '1'
steps: steps:
- uses: actions/create-release@master - uses: softprops/action-gh-release@v2.1.0
id: createRelease id: createRelease
name: Create Runner Release name: Create Runner Release
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
tag_name: "${{ needs.check_version.outputs.FRIDA_VERSION }}" tag_name: "${{ needs.check_version.outputs.FRIDA_VERSION }}"
release_name: "${{ needs.check_version.outputs.FRIDA_VERSION }}" name: "${{ needs.check_version.outputs.FRIDA_VERSION }}"
prerelease: false prerelease: false
android_build: android_build:
@@ -121,7 +121,7 @@ jobs:
id: setup-ndk id: setup-ndk
uses: nttld/setup-ndk@v1 uses: nttld/setup-ndk@v1
with: with:
ndk-version: r25b ndk-version: r25c
local-cache: false local-cache: false
link-to-sdk: true link-to-sdk: true

8
patches/frida-core/0001-Florida-string_frida_rpc.patch
View File

@@ -1,4 +1,4 @@
From d7201c32bd8cf347cacd7427a942e0e0188045a1 Mon Sep 17 00:00:00 2001 From 9ff24d5b1b81bf5a2fc8ff517bc0caba0e3288e9 Mon Sep 17 00:00:00 2001
From: Ylarod <me@ylarod.cn> From: Ylarod <me@ylarod.cn>
Date: Tue, 18 Jul 2023 15:51:29 +0800 Date: Tue, 18 Jul 2023 15:51:29 +0800
Subject: [PATCH 1/9] Florida: string_frida_rpc Subject: [PATCH 1/9] Florida: string_frida_rpc
@@ -8,7 +8,7 @@ Subject: [PATCH 1/9] Florida: string_frida_rpc
1 file changed, 12 insertions(+), 3 deletions(-) 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/base/rpc.vala b/lib/base/rpc.vala diff --git a/lib/base/rpc.vala b/lib/base/rpc.vala
index 3695ba8c..664bd19c 100644 index 8990b70e..d5acfebd 100644
--- a/lib/base/rpc.vala --- a/lib/base/rpc.vala
+++ b/lib/base/rpc.vala +++ b/lib/base/rpc.vala
@@ -11,13 +11,22 @@ namespace Frida { @@ -11,13 +11,22 @@ namespace Frida {
@@ -24,7 +24,7 @@ index 3695ba8c..664bd19c 100644
+ } + }
+ } + }
+ +
public async Json.Node call (string method, Json.Node[] args, Cancellable? cancellable) throws Error, IOError { public async Json.Node call (string method, Json.Node[] args, Bytes? data, Cancellable? cancellable) throws Error, IOError {
string request_id = Uuid.string_random (); string request_id = Uuid.string_random ();
var request = new Json.Builder (); var request = new Json.Builder ();
@@ -54,5 +54,5 @@ index 3695ba8c..664bd19c 100644
var request_id_value = rpc_message.get_element (1); var request_id_value = rpc_message.get_element (1);
-- --
2.42.0 2.47.1