From 7a30332619b484f381d0635431d885e553a278d2 Mon Sep 17 00:00:00 2001 From: "Johan T. Halseth" Date: Wed, 15 Jul 2020 15:19:25 +0200 Subject: [PATCH] mobile: use single "mobile" build tag instead of "ios" and "android" Since the "android" build tag conflicts with a go compiler build tag, we instead use a single "mobile" tag for both platforms. --- Makefile | 4 ++-- mobile/bindings.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 24d15ecb1..8080d76da 100644 --- a/Makefile +++ b/Makefile @@ -224,12 +224,12 @@ vendor: ios: vendor mobile-rpc @$(call print, "Building iOS framework ($(IOS_BUILD)).") mkdir -p $(IOS_BUILD_DIR) - $(GOMOBILE_BIN) bind -target=ios -tags="ios $(DEV_TAGS) autopilotrpc experimental" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) + $(GOMOBILE_BIN) bind -target=ios -tags="mobile $(DEV_TAGS) autopilotrpc experimental" $(LDFLAGS) -v -o $(IOS_BUILD) $(MOBILE_PKG) android: vendor mobile-rpc @$(call print, "Building Android library ($(ANDROID_BUILD)).") mkdir -p $(ANDROID_BUILD_DIR) - $(GOMOBILE_BIN) bind -target=android -tags="android $(DEV_TAGS) autopilotrpc experimental" $(LDFLAGS) -v -o $(ANDROID_BUILD) $(MOBILE_PKG) + $(GOMOBILE_BIN) bind -target=android -tags="mobile $(DEV_TAGS) autopilotrpc experimental" $(LDFLAGS) -v -o $(ANDROID_BUILD) $(MOBILE_PKG) mobile: ios android diff --git a/mobile/bindings.go b/mobile/bindings.go index d64540b98..fcf8c11df 100644 --- a/mobile/bindings.go +++ b/mobile/bindings.go @@ -1,4 +1,4 @@ -// +build ios android +// +build mobile package lndmobile