From cd0125ee0cea9cd7576f0739a9e297dfa2359be6 Mon Sep 17 00:00:00 2001 From: cyBerta <cyberta@riseup.net> Date: Fri, 11 Nov 2022 00:46:27 +0100 Subject: [PATCH] actually cross-compile motd in build_core.sh --- build_core.sh | 12 ++++++------ go.mod | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/build_core.sh b/build_core.sh index 0da0afa..36ac113 100755 --- a/build_core.sh +++ b/build_core.sh @@ -125,19 +125,19 @@ fi showtitle "Building Bitmask core as full aar" -gomobile bind -target='android' -o ./lib/bitmaskcore.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android' -o ./lib/bitmaskcore.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd showtitle "Building Bitmask web core as full aar including pgpverify" -gomobile bind -target='android' -o ./lib/bitmaskcore_web.aar -v org.0xacab/leap/bitmaskcore/pgpverify org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android' -o ./lib/bitmaskcore_web.aar -v org.0xacab/leap/bitmaskcore/pgpverify org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd showtitle "Building Bitmask core for armv7" -gomobile bind -target='android/arm' -o ./lib/bitmaskcore_arm.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android/arm' -o ./lib/bitmaskcore_arm.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd showtitle "Building Bitmask core for x86" -gomobile bind -target='android/386' -o ./lib/bitmaskcore_x86.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android/386' -o ./lib/bitmaskcore_x86.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd showtitle "Building Bitmask core for arm64" -gomobile bind -target='android/arm64' -o ./lib/bitmaskcore_arm64.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android/arm64' -o ./lib/bitmaskcore_arm64.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd showtitle "Building Bitmask core for x86_64" -gomobile bind -target='android/amd64' -o ./lib/bitmaskcore_x86_64.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go +gomobile bind -target='android/amd64' -o ./lib/bitmaskcore_x86_64.aar -v org.0xacab/leap/bitmaskcore/shapeshifter org.0xacab/leap/bitmaskcore/obfsvpn/client org.0xacab/leap/bitmaskcore/IPtProxy/IPtProxy.go org.0xacab/leap/bitmaskcore/motd diff --git a/go.mod b/go.mod index 1bdb431..482797f 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,10 @@ require ( golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e ) -require 0xacab.org/leap/bitmask-vpn v0.0.0-20220815172210-505316ad1a11 +require ( + 0xacab.org/leap/bitmask-vpn v0.0.0-20220815172210-505316ad1a11 + golang.org/x/mobile v0.0.0-20221020085226-b36e6246172e +) require ( github.com/dchest/siphash v1.2.3 // indirect @@ -58,7 +61,6 @@ require ( github.com/tjfoc/gmsm v1.4.1 // indirect github.com/xtaci/kcp-go/v5 v5.6.1 // indirect github.com/xtaci/smux v1.5.16 // indirect - golang.org/x/mobile v0.0.0-20221020085226-b36e6246172e // indirect golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect -- GitLab