lysann/passforios-gopenpgp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change gomobile fork to use the github.com/ProtonMail/go-mobile fork (#107)

Browse source 
* changed the go-mobile fork to use PM's fork

* changed build dir in build.sh

* changed the build dir so we need to change the upload source

* fix syntax err in github action

* fixed the error with the new build dir

* added the java package flag for android builds

* removed the other go-mobile forks from the go.sum

Co-authored-by: marin thiercelin <marin.thiercelin@pm.me>
This commit is contained in:
marinthiercelin 2020-12-09 01:03:39 -08:00 • committed by GitHub
parent 71d595a366
commit 2a4ac0999b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
build.sh
View file

@ -26,16 +26,23 @@ import()
build()
{
TARGET=$1
JAVA_PKG=$2
if [ $TARGET = "android" ]; then
OUT_EXTENSION="aar"
if [ -z "$JAVA_PKG" ]; then
JAVAPKG_FLAG="-javapkg=$JAVA_PKG"
else
JAVAPKG_FLAG=""
fi
else
OUT_EXTENSION="framework"
JAVAPKG_FLAG=""
fi
TARGET_DIR=${BUILD_DIR}/${TARGET}
TARGET_OUT_FILE=${TARGET_DIR}/${BUILD_NAME}.${OUT_EXTENSION}
mkdir -p $TARGET_DIR
printf "\e[0;32mStart Building ${TARGET} .. Location: ${TARGET_DIR} \033[0m\n\n"
gomobile bind -tags mobile -target $TARGET -x -o ${TARGET_OUT_FILE} -ldflags="${LDFLAGS}" ${PACKAGES}
gomobile bind -tags mobile -target $TARGET $JAVAPKG_FLAG -x -o ${TARGET_OUT_FILE} -ldflags="${LDFLAGS}" ${PACKAGES}
}
@ -44,7 +51,7 @@ build()
# ==== Generic parameters ======
# output directory
BUILD_DIR="./build"
BUILD_DIR="./dist"
# linkage flags
LDFLAGS="'all=-s -w'"
@ -113,8 +120,8 @@ xcodebuild -create-xcframework -framework $BUILD_DIR/ios/$BUILD_NAME.framework -
fi
# ================ Android Build =====================
if [ "$#" -ne 1 ] || [ $1 = android ]; then
ANDROID_JAVA_PAG="com.proton.${ANDROID_OUT_FILE_NAME}"
build android
ANDROID_JAVA_PAG="com.proton.${BUILD_NAME}"
build android $ANDROID_JAVA_PAG
printf "\e[0;32mAll Done. \033[0m\n\n"
fi