From 55f59a90999312f40d93642cb8e0a62fa6f0baef Mon Sep 17 00:00:00 2001
From: atavism <atavism@users.noreply.github.com>
Date: Mon, 18 Nov 2024 19:58:50 -0800
Subject: [PATCH] update version check and retain debug symbols in release
 builds (#1237)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fa684e6ff..ead8c18f2 100644
--- a/Makefile
+++ b/Makefile
@@ -254,7 +254,7 @@ require-app: guard-APP
 
 .PHONY: require-version
 require-version: guard-VERSION
-	@if ! [[ "$$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$$ ]]; then \
+	@if ! echo "$$VERSION" | grep -Eq "^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$$"; then \
 		echo "VERSION must be a semantic version like '1.2.10' or '1.2.10-foo"; \
 		exit 1; \
 	fi
@@ -352,7 +352,7 @@ $(ANDROID_LIB): $(GO_SOURCES)
 	    -target=$(ANDROID_ARCH_GOMOBILE) \
 		-tags='headless lantern' -o=$(ANDROID_LIB) \
 		-androidapi=23 \
-		-ldflags="-s -w $(LDFLAGS)" \
+		-ldflags="$(LDFLAGS) $(EXTRA_LDFLAGS)" \
 		$(GOMOBILE_EXTRA_BUILD_FLAGS) \
 		github.com/getlantern/lantern-client/internalsdk github.com/getlantern/pathdb/testsupport github.com/getlantern/pathdb/minisql