diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 6fe6f6c780..f6c6b914a9 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -316,7 +316,7 @@ jobs: toolchain: stable - uses: nttld/setup-ndk@v1 with: - ndk-version: r21e + ndk-version: r25b - name: install ios run: rustup target add aarch64-apple-ios - name: install android @@ -326,7 +326,7 @@ jobs: - uses: actions/checkout@v3 - uses: Swatinem/rust-cache@v2 - 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 run: cargo ndk -t arm64-v8a build --release #run: cargo build --target aarch64-linux-android diff --git a/libafl_frida/src/asan/asan_rt.rs b/libafl_frida/src/asan/asan_rt.rs index 3602be11a2..82504c643b 100644 --- a/libafl_frida/src/asan/asan_rt.rs +++ b/libafl_frida/src/asan/asan_rt.rs @@ -1671,9 +1671,8 @@ impl AsanRuntime { let mut map_flags = MapFlags::MAP_ANON | MapFlags::MAP_PRIVATE; // apple aarch64 requires MAP_JIT to allocates WX pages - if cfg!(all(target_vendor = "apple", target_arch = "aarch64")) { - map_flags |= MapFlags::MAP_JIT; - } + #[cfg(all(target_vendor = "apple", target_arch = "aarch64"))] + map_flags |= MapFlags::MAP_JIT; unsafe { let mapping = mmap(