SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Frida: Fix Android build (#1154)

Browse Source 
* update android version

* fix android build some more
This commit is contained in:
Dominik Maier 2023-03-16 16:26:22 +01:00 committed by GitHub
parent b9970cbdac
commit 306cdcd800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_and_test.yml vendored
View File

@ -316,7 +316,7 @@ jobs:
toolchain: stable toolchain: stable
- uses: nttld/setup-ndk@v1 - uses: nttld/setup-ndk@v1
with: with:
ndk-version: r21e ndk-version: r25b
- name: install ios - name: install ios
run: rustup target add aarch64-apple-ios run: rustup target add aarch64-apple-ios
- name: install android - name: install android
@ -326,7 +326,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2
- name: Build iOS - name: Build iOS
run: cargo build --target aarch64-apple-ios run: cargo build --target aarch64-apple-ios && cd libafl_frida && cargo build --target aarch64-apple-ios && cd ..
- name: Build Android - name: Build Android
run: cargo ndk -t arm64-v8a build --release run: cargo ndk -t arm64-v8a build --release
#run: cargo build --target aarch64-linux-android #run: cargo build --target aarch64-linux-android

5
libafl_frida/src/asan/asan_rt.rs
View File

@ -1671,9 +1671,8 @@ impl AsanRuntime {
let mut map_flags = MapFlags::MAP_ANON | MapFlags::MAP_PRIVATE; let mut map_flags = MapFlags::MAP_ANON | MapFlags::MAP_PRIVATE;
// apple aarch64 requires MAP_JIT to allocates WX pages // apple aarch64 requires MAP_JIT to allocates WX pages
if cfg!(all(target_vendor = "apple", target_arch = "aarch64")) { #[cfg(all(target_vendor = "apple", target_arch = "aarch64"))]
map_flags |= MapFlags::MAP_JIT; map_flags |= MapFlags::MAP_JIT;
}
unsafe { unsafe {
let mapping = mmap( let mapping = mmap(