Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Test android openssl fix
Browse files Browse the repository at this point in the history
talregev committed May 20, 2022

Verified

This commit was signed with the committer’s verified signature.
1 parent df1458f commit 68524dc
Showing 10 changed files with 10 additions and 46 deletions.
2 changes: 1 addition & 1 deletion android/build_boinc_arm.sh
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then

echo "Stripping Binaries"
cd stage/usr/local/bin
arm-linux-androideabi-strip *
llvm-strip *
cd ../../../../

echo "Copy Assets"
2 changes: 1 addition & 1 deletion android/build_boinc_arm64.sh
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then

echo "Stripping Binaries"
cd stage/usr/local/bin
aarch64-linux-android-strip *
llvm-strip *
cd ../../../../

echo "Copy Assets"
2 changes: 1 addition & 1 deletion android/build_boinc_x86.sh
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then

echo "Stripping Binaries"
cd stage/usr/local/bin
i686-linux-android-strip *
llvm-strip *
cd ../../../../

echo "Copy Assets"
2 changes: 1 addition & 1 deletion android/build_boinc_x86_64.sh
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then

echo "Stripping Binaries"
cd stage/usr/local/bin
x86_64-linux-android-strip *
llvm-strip *
cd ../../../../

echo "Copy Assets"
2 changes: 1 addition & 1 deletion android/ci_build_libs_cmake.sh
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
export ANDROID_NDK_HOME=$NDK_ROOT
fi
BUILD_TRIPLET=build-$TRIPLET
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_MANIFEST_DIR=lib/vcpkg_config_android -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
cmake --build $BUILD_TRIPLET

echo "\e[1;32m $TRIPLET done \e[0m"
4 changes: 2 additions & 2 deletions android/ndk_common.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/sh

export NDK_VERSION=21d
export NDK_VERSION=23b
export NDK_ARMV6_VERSION=15c
export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
export NDK_ARMV6_ROOT=$BUILD_DIR/android-ndk-r${NDK_ARMV6_VERSION}

createNDKFolder()
{
ndk_filename=android-ndk-r${NDK_VERSION}-linux-x86_64.zip
ndk_filename=android-ndk-r${NDK_VERSION}-linux.zip
rm -rf "$BUILD_DIR/android-ndk-r${NDK_VERSION}"
echo Downloading $ndk_filename
wget -c --no-verbose -O /tmp/$ndk_filename https://dl.google.com/android/repository/$ndk_filename
9 changes: 1 addition & 8 deletions android/vcpkg_config_apps/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "boinc-apps",
"version-string": "7.19.0",
"builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
"dependencies":
[
{
@@ -10,11 +9,5 @@
"default-features": false
},
"rappture"
],
"overrides": [
{
"name": "openssl",
"version-string": "1.1.1n"
}
]
]
}
9 changes: 1 addition & 8 deletions android/vcpkg_config_client/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{
"name": "boinc-client",
"version-string": "7.19.0",
"builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
"dependencies":
[
{
"name": "curl",
"features": ["openssl"],
"default-features": false
}
],
"overrides": [
{
"name": "openssl",
"version-string": "1.1.1n"
}
]
]
}
9 changes: 1 addition & 8 deletions android/vcpkg_config_libs/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
{
"name": "boinc-libs",
"version-string": "7.19.0",
"builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
"dependencies":
[
{
"name": "curl",
"features": ["openssl"],
"default-features": false
}
],
"overrides": [
{
"name": "openssl",
"version-string": "1.1.1n"
}
]
]
}
15 changes: 0 additions & 15 deletions lib/vcpkg_config_android/vcpkg.json

This file was deleted.

0 comments on commit 68524dc

Please sign in to comment.