From 8f90f50047f8ae0d416a0d27a252bfc916857168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donncha=20=C3=93=20Cearbhaill?= Date: Sun, 16 Jul 2023 18:22:43 +0200 Subject: [PATCH] Remove unneccessary armv7 binary, armv6 binary can be used --- adb/collector.go | 4 ++-- android-collector/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adb/collector.go b/adb/collector.go index fa8f2d8..cf84887 100644 --- a/adb/collector.go +++ b/adb/collector.go @@ -101,9 +101,9 @@ func (c *Collector) Install() error { collectorName := "" switch { case strings.HasPrefix(c.Architecture, "armeabi-v"): - collectorName = "collector_arm6" + collectorName = "collector_arm" case strings.HasPrefix(c.Architecture, "armeabi-v7"): - collectorName = "collector_arm7" + collectorName = "collector_arm" case strings.HasPrefix(c.Architecture, "arm64-v8"): collectorName = "collector_arm64" default: diff --git a/android-collector/Makefile b/android-collector/Makefile index 0a833d5..186b7fd 100644 --- a/android-collector/Makefile +++ b/android-collector/Makefile @@ -17,15 +17,15 @@ fmt: build_arm: env GOOS=linux GOARCH=arm GOARM=6 go build -ldflags="-s -w" -o $(BUILD_FOLDER)/collector_arm - if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_arm; fi + if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_arm; fi # UPX_COMPRESS build_arm64: env GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" -o $(BUILD_FOLDER)/collector_arm64 - if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_arm64; fi + if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_arm64; fi # UPX_COMPRESS build_amd64: env GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o $(BUILD_FOLDER)/collector_amd64 - if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_amd64; fi + if [[ $(UPX_COMPRESS) -gt 0 ]]; then upx -$(UPX_COMPRESS) $(BUILD_FOLDER)/collector_amd64; fi # UPX_COMPRESS build: build_arm build_arm64 build_amd64