Skip to content

Commit

Permalink
Remove unneccessary armv7 binary, armv6 binary can be used
Browse files Browse the repository at this point in the history
  • Loading branch information
DonnchaC committed Jul 16, 2023
1 parent 2365fb3 commit 8f90f50
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions adb/collector.go
Original file line number Diff line number Diff line change
@@ -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:
6 changes: 3 additions & 3 deletions android-collector/Makefile
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 8f90f50

Please sign in to comment.