ensure we aren't including/claiming to build any ARM v7 things

Author: bmpngrok

.github/workflows/ci.yml

@@ -118,22 +118,17 @@ jobs:
             target: aarch64-linux-android
             if: ${{ github.ref == 'refs/heads/main' }}
             build: yarn build --target aarch64-linux-android
-          # - host: ubuntu-latest
-          #   target: armv7-linux-androideabi
-          #   if: false
-          #   build: |
-          #     yarn build --target armv7-linux-androideabi
           - host: ubuntu-latest
             target: aarch64-unknown-linux-musl
             if: ${{ github.ref == 'refs/heads/main' }}
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: |
-              apk add clang18 llvm18
-              ln -s /usr/lib/llvm-18/lib/libclang.so.1 /usr/lib/libclang.so
+              apk add musl-dev gcc make cmake clang llvm build-base
               rustup target add aarch64-unknown-linux-musl
-              export CC_aarch64_unknown_linux_musl=aarch64-linux-musl-gcc
-              export CXX_aarch64_unknown_linux_musl=aarch64-linux-musl-g++
-              export AR_aarch64_unknown_linux_musl=aarch64-linux-musl-ar
+              export CARGO_BUILD_TARGET="aarch64-unknown-linux-musl"
+              ln -s /usr/lib/gcc/aarch64-alpine-linux-musl/14.2.0/crtbeginS.o /usr/lib
+              ln -s /usr/lib/gcc/aarch64-alpine-linux-musl/14.2.0/crtendS.o /usr/lib
+              ln -s /usr/lib/gcc/aarch64-alpine-linux-musl/14.2.0/libgcc.a /usr/lib
               yarn build --target aarch64-unknown-linux-musl
           - host: windows-latest
             target: aarch64-pc-windows-msvc

npm/android-arm-eabi/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@ngrok/ngrok",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [
@@ -27,7 +27,6 @@
         "x86_64-unknown-linux-musl",
         "x86_64-unknown-freebsd",
         "i686-pc-windows-msvc",
-        "armv7-linux-androideabi",
         "universal-apple-darwin"
       ]
     }