diff options
| author | Albin <albin@mullvad.net> | 2025-01-24 12:50:31 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-01-24 12:50:31 +0100 |
| commit | a1571dfba74d2302571a014020dc0048100832eb (patch) | |
| tree | 6a77312b5856039e56c2cc1f3a8080d1ddfb6874 | |
| parent | ecd86f782691635ce85560f4460f3b4911cdf0ca (diff) | |
| parent | ef51904ca8ae8b16c8b5b39a204855f852d983e5 (diff) | |
| download | mullvadvpn-a1571dfba74d2302571a014020dc0048100832eb.tar.xz mullvadvpn-a1571dfba74d2302571a014020dc0048100832eb.zip | |
Merge branch 'improve-reproducibility-android'
| -rwxr-xr-x | android/build.sh | 3 | ||||
| -rw-r--r-- | wireguard-go-rs/libwg/Android.mk | 12 |
2 files changed, 5 insertions, 10 deletions
diff --git a/android/build.sh b/android/build.sh index 1825c52a3d..a842c7ff9e 100755 --- a/android/build.sh +++ b/android/build.sh @@ -87,4 +87,7 @@ echo " You have built:" echo "" echo " $PRODUCT_VERSION" echo "" +echo " Build checksums:" +md5sum ../dist/MullvadVPN-"$PRODUCT_VERSION"* | sed 's/^/ /' +echo "" echo "**********************************" diff --git a/wireguard-go-rs/libwg/Android.mk b/wireguard-go-rs/libwg/Android.mk index 4c9eeaab96..23b32cd81f 100644 --- a/wireguard-go-rs/libwg/Android.mk +++ b/wireguard-go-rs/libwg/Android.mk @@ -22,14 +22,6 @@ export CGO_ENABLED := 1 default: $(DESTDIR)/libwg.so -GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m)) -GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]') -GOBUILDVERSION := 1.21.3 -# TODO: Add checksum? -GOBUILDTARBALL := https://go.dev/dl/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz -GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH) - - $(DESTDIR)/libwg.so: mkdir -p $(DESTDIR) # Build libmaybenot @@ -37,9 +29,9 @@ $(DESTDIR)/libwg.so: # Build wireguard-go go get -tags "linux android daita" chmod -fR +w "$(GOPATH)/pkg/mod" - go build -tags "linux android daita" -ldflags="-X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared -buildvcs=false + # The `-buildid=` and `-trimpath` flags are needed to make the build reproducible. + go build -tags "linux android daita" -ldflags="-buildid= -X main.socketDirectory=/data/data/$(ANDROID_PACKAGE_NAME)/cache/wireguard" -v -o "$@" -buildmode c-shared -buildvcs=false -trimpath rm -f $(DESTDIR)/libwg.h - clean: rm -f $(DESTDIR)/libwg.so |