Skip to content
Snippets Groups Projects
Commit 3e9d511c authored by cyberta's avatar cyberta
Browse files

Merge branch 'tweak_renaming' into 'main'

rename references to bitmaskcore to bitmask-core-andrdoid, adapt module name

See merge request !1
parents 72f4ed42 11d6ab96
Branches
No related tags found
1 merge request!1rename references to bitmaskcore to bitmask-core-andrdoid, adapt module name
...@@ -23,14 +23,14 @@ git submodule add git://<repository_url.git> <new_lib_directory> ...@@ -23,14 +23,14 @@ git submodule add git://<repository_url.git> <new_lib_directory>
go work use <new_lib_directory> go work use <new_lib_directory>
``` ```
3. Make sure the `bitmaskcore/golang` directory is empty. 3. Make sure the `bitmask-core-android/golang` directory is empty.
``` ```
# you should be in bitmaskcore # you should be in bitmask-core-android
sudo rm -rf ./golang/* sudo rm -rf ./golang/*
``` ```
4. And let go add any missing modules. 4. And let go add any missing modules.
``` ```
# you should be in bitmaskcore # you should be in bitmask-core-android
go mod tidy go mod tidy
``` ```
5. extend the `gomobile bind` statements with the new module in `./build_core.sh` and `./build_core_dev.sh` 5. extend the `gomobile bind` statements with the new module in `./build_core.sh` and `./build_core_dev.sh`
......
...@@ -116,20 +116,20 @@ else ...@@ -116,20 +116,20 @@ else
fi fi
showtitle "Building Bitmask core as full aar" showtitle "Building Bitmask Core Android as full aar"
gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go
showtitle "Building Bitmask web core as full aar including pgpverify" showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for armv7" showtitle "Building Bitmask Core Android for armv7"
gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for x86" showtitle "Building Bitmask Core Android for x86"
gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for arm64" showtitle "Building Bitmask Core Android for arm64"
gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for x86_64" showtitle "Building Bitmask Core Android for x86_64"
gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
#!/bin/bash #!/bin/bash
# This script is meant to be used during development of any component related to bitmaskcore # This script is meant to be used during development of any component related to bitmask-core-android
# Make sure you have run build_core.sh at least once before using this script, so that # Make sure you have run build_core.sh at least once before using this script, so that
# golang dev environment is correctly setup, all patches have been applied to the submodules etc. # golang dev environment is correctly setup, all patches have been applied to the submodules etc.
# This script only builds the different go submodules together as they are currently checked out. # This script only builds the different go submodules together as they are currently checked out.
...@@ -122,22 +122,22 @@ else ...@@ -122,22 +122,22 @@ else
fi fi
showtitle "Building Bitmask core as full aar" showtitle "Building Bitmask Core Android as full aar"
gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go gomobile bind -x -target android -ldflags="-s -w" -tags=netcgo -androidapi=21 -v -trimpath -o lib/bitmaskcore.aar ./obfsvpn/client/ ./motd ./IPtProxy/IPtProxy.go
showtitle "Building Bitmask web core as full aar including pgpverify" showtitle "Building Bitmask Core Android Web as full aar including pgpverify"
gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -x -target='android' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_web.aar -v ./pgpverify ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for armv7" showtitle "Building Bitmask Core Android for armv7"
gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/arm' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for x86" showtitle "Building Bitmask Core Android for x86"
gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/386' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for arm64" showtitle "Building Bitmask Core Android for arm64"
gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/arm64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_arm64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
showtitle "Building Bitmask core for x86_64" showtitle "Building Bitmask Core Android for x86_64"
gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd gomobile bind -target='android/amd64' -ldflags="-s -w" -androidapi=21 -v -tags=netcgo -trimpath -o ./lib/bitmaskcore_x86_64.aar -v ./obfsvpn/client ./IPtProxy/IPtProxy.go ./motd
if [[ "bitmask_android" == `pwd | rev | cut -d / -f 2 | rev` ]]; then if [[ "bitmask_android" == `pwd | rev | cut -d / -f 2 | rev` ]]; then
......
module org.0xacab/leap/bitmaskcore module 0xacab.org/leap/bitmask-core-android
go 1.22.2 go 1.22.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment