build(android): remove stale nat traversal artifacts

Author: richard-ramos

.github/workflows/mobile_android.yml

@@ -54,8 +54,6 @@ jobs:
           test -f "$out/lib/liblibp2p.so"
           test -f "$out/lib/liblibp2p.a"
           test -f "$out/lib/libc++_shared.so"
-          test -f "$out/lib/libminiupnpc.a"
-          test -f "$out/lib/libnatpmp.a"
           test -f "$out/include/libp2p.h"
           test -f "$out/include/nim_ffi_cbor.h"
           test -f "$out/include/nim_ffi_prelude.h"

.pinned

@@ -15,5 +15,5 @@ stew;https://github.com/status-im/nim-stew@#b66168735d6f3841c5239c3169d3fe5fe98b
 websock;https://github.com/status-im/nim-websock@#387a8eb7e961e8fdd3b1a717d36bc53b55e4dc5d
 zlib;https://github.com/status-im/nim-zlib@#e680f269fb01af2c34a2ba879ff281795a5258fe
 protobuf_serialization;https://github.com/status-im/nim-protobuf-serialization@#8406e7287196661614ce6a8e8be20f755376af7f
-nat_traversal;https://github.com/status-im/nim-nat-traversal@#860e18c37667b5dd005b94c63264560c35d88004
+libplum;https://github.com/logos-storage/nim-libplum@#acefbe424cf9d1f05f2d93533790c9ac4e034df8
 npeg;https://github.com/zevv/npeg@#409f6796d0e880b3f0222c964d1da7de6e450811

docs/mobile_android.md

@@ -14,8 +14,8 @@ toolchain from Nix:
 | `x86_64` | `amd64` | `x86_64-linux-android23-clang` |
 
 The Nix derivation currently pins Android NDK `27.2.12479018` through
-`androidenv.composeAndroidPackages` and rebuilds the vendored `nat_traversal` C
-libraries with the same Android clang used for Nim-generated C code.
+`androidenv.composeAndroidPackages` and uses the same Android clang for
+Nim-generated C code and the C check harness.
 
 ## Build Commands
 
@@ -53,8 +53,6 @@ result/
   lib/liblibp2p.so
   lib/liblibp2p.a
   lib/libc++_shared.so
-  lib/libminiupnpc.a
-  lib/libnatpmp.a
   nix-support/android-target
 ```
 
@@ -86,14 +84,7 @@ library.
 For shared-library linking, package the matching ABI's `lib/liblibp2p.so` and
 `lib/libc++_shared.so` with the Android application and load them through the
 normal Android native library path. For static linking, link `lib/liblibp2p.a`
-together with `lib/libminiupnpc.a`, `lib/libnatpmp.a`, and the Android C++
-runtime selected by your application.
-
-## Dependency Notes
-
-The Android derivation uses a writable copy of `nat_traversal` so its vendored
-`miniupnpc` and `libnatpmp` archives can be rebuilt with the selected Android
-clang.
+together with the Android C++ runtime selected by your application.
 
 ## Android Check Harness
 

libp2p.nimble

@@ -13,7 +13,7 @@ requires "nim >= 2.2.4",
   "chronos >= 4.2.2", "metrics >= 0.2.2", "secp256k1", "stew >= 0.4.2", "results",
   "serialization", "lsquic >= 0.5.5", "protobuf_serialization >= 0.5.3",
   "https://github.com/status-im/nim-websock >= 0.4.0",
-  "https://github.com/status-im/nim-nat-traversal >= 0.0.1"
+  "https://github.com/logos-storage/nim-libplum#acefbe424cf9d1f05f2d93533790c9ac4e034df8"
 
 import os, sequtils, strutils
 

nix/cbind-ffi-android.nix

@@ -10,13 +10,9 @@ let
   deps = import ./deps.nix { inherit pkgs; };
   cbindDeps = import ./cbind-deps.nix { inherit pkgs; };
 
-  # nat_traversal is copied into the build directory because its vendored C
-  # archives need to be rebuilt with the Android toolchain.
-  depsWithoutWritable = builtins.removeAttrs deps [ "nat_traversal" ];
-
   pathArgs =
     builtins.concatStringsSep " "
-      (map (p: "--path:${p}") (builtins.attrValues depsWithoutWritable));
+      (map (p: "--path:${p}") (builtins.attrValues deps));
 
   cbindPathArgs =
     builtins.concatStringsSep " "
@@ -98,31 +94,16 @@ pkgs.stdenv.mkDerivation {
     fi
 
     mkdir -p build $NIMCACHE
-
-    echo "== Preparing writable dependency copies for Android ${abi} =="
-    NAT_PKG=$TMPDIR/nat_traversal
-    cp -r ${deps.nat_traversal} $NAT_PKG
-    chmod -R +w $NAT_PKG
-
-    echo "== Building nat_traversal vendored C libs for Android ${abi} =="
-    make -C "$NAT_PKG/vendor/miniupnp/miniupnpc" \
-      CC="$ANDROID_CC" AR="$ANDROID_AR" RANLIB="$ANDROID_RANLIB" \
-      CFLAGS="-Os -fPIC -DANDROID" \
-      build/libminiupnpc.a
-
-    make -C "$NAT_PKG/vendor/libnatpmp-upstream" \
-      CC="$ANDROID_CC" AR="$ANDROID_AR" RANLIB="$ANDROID_RANLIB" \
-      CFLAGS="-Wall -Os -fPIC -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4" \
-      libnatpmp.a
+    echo 'INPUT(-lc)' > build/libpthread.so
 
     # ffiThreadExitTimeoutMs: bound the FFI thread's graceful-shutdown wait; the
     # 1500ms default is too tight for libp2pDestroy's switch.stop() over many conns.
-    commonArgs="--noNimblePath ${cbindPathArgs} ${pathArgs} --path:$NAT_PKG \
+    commonArgs="--noNimblePath ${cbindPathArgs} ${pathArgs} \
       --os:android --cpu:${nimCpu} --cc:clang \
       --clang.path:$ANDROID_TOOLCHAIN/bin \
       --clang.exe:${androidCcName} --clang.linkerexe:${androidCxxName} \
       --passC:-DANDROID --passC:-fPIC \
-      --passL:-lc++_shared --passL:-llog --passL:-ldl --passL:-lm \
+      --passL:-L$PWD/build --passL:-lc++_shared --passL:-llog --passL:-ldl --passL:-lm \
       --threads:on --opt:size --noMain --mm:refc --d:metrics \
       -d:ffiThreadExitTimeoutMs=5000 \
       --nimMainPrefix:liblibp2p --nimcache:$NIMCACHE"
@@ -156,7 +137,7 @@ pkgs.stdenv.mkDerivation {
       obj=build/check-objects/$(basename "$src" .c).o
       "$ANDROID_CC" -std=c11 -fPIE -I cbind/c_bindings/tinycbor -c "$src" -o "$obj"
     done
-    "$ANDROID_CXX" -fPIE -pie -pthread \
+    "$ANDROID_CXX" -L build -fPIE -pie -pthread \
       build/check-objects/*.o build/liblibp2p.so \
       -lc++_shared -ldl -lm -llog \
       -o build/libp2p_ffi_android_check
@@ -172,9 +153,6 @@ pkgs.stdenv.mkDerivation {
     cp build/liblibp2p.so $out/lib/
     cp build/liblibp2p.a  $out/lib/
     cp "$ANDROID_CXX_STDLIB" $out/lib/
-    cp $NAT_PKG/vendor/miniupnp/miniupnpc/build/libminiupnpc.a $out/lib/
-    cp $NAT_PKG/vendor/libnatpmp-upstream/libnatpmp.a          $out/lib/
-
     cp cbind/c_bindings/*.h $out/include/
     cp -r cbind/c_bindings/tinycbor $out/include/
     cp -r cbind/cddl_bindings $out/include/

nix/deps.nix

@@ -31,10 +31,10 @@
     fetchSubmodules = true;
   };
 
-  nat_traversal = pkgs.fetchgit {
-    url = "https://github.com/status-im/nim-nat-traversal";
-    rev = "860e18c37667b5dd005b94c63264560c35d88004";
-    sha256 = "0319k5bbl468phwfnvlrh7725sc80rnf7m9gyj0i3cb5hb9q78bs";
+  libplum = pkgs.fetchgit {
+    url = "https://github.com/logos-storage/nim-libplum";
+    rev = "acefbe424cf9d1f05f2d93533790c9ac4e034df8";
+    sha256 = "0j6rc96cznsh90pvs27i1qgpby3ib04a2xqihps3jwlnlng2nrkb";
     fetchSubmodules = true;
   };