Skip to content

Commit 72f2ec1

Browse files
author
Andras Fekete
committed
Clean up building wolfProvider for test server
1 parent ff27e42 commit 72f2ec1

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

IDE/Android/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ Providers:
4040
evppkey_kdf_tls1_prf.txt ... PASS
4141
```
4242

43-
An alternate way of running `build.sh` is within a Docker environment. This can avoid unwanted local changes to your system by wrapping the environment in a container. Simply launch Docker with `docker run --rm -it -v $(pwd):/ws -w /ws ubuntu:22.04 build.sh`. This should start the script and build everything in the local folder. Then you can take the `run.sh` script and run it from your host environment.
43+
An alternate way of running `build.sh` is within a Docker environment. This can avoid unwanted local changes to your system by wrapping the environment in a container. Simply launch Docker with `docker run --rm -it -v $(pwd)/../../:/ws -w /ws/IDE/Android ubuntu:22.04 ./build.sh`. This should start the script and build everything in the local folder. Then you can take the `run.sh` script and run it from your host environment.

IDE/Android/build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ if [ "${AUTO_INSTALL_TOOLS}" == "true" ]; then
99
fi
1010

1111
# https://developer.android.com/ndk/downloads/
12+
export ANDROID_NDK_ROOT=${WORKSPACE}/android-ndk-r26b
1213
if [ ! -e ${ANDROID_NDK_ROOT} ]; then
1314
wget https://dl.google.com/android/repository/android-ndk-r26b-linux.zip
1415
unzip android-ndk-r26b-linux.zip
1516
fi
16-
export ANDROID_NDK_ROOT=${WORKSPACE}/android-ndk-r26b
1717
PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH"
1818

1919
# Compile OpenSSL
@@ -45,10 +45,11 @@ fi
4545
export LD_LIBRARY_PATH="${WORKSPACE}/wolfssl-install/lib:$LD_LIBRARY_PATH"
4646
export LIBRARY_PATH="${WORKSPACE}/wolfssl-install/lib:$LIBRARY_PATH"
4747

48+
# If running in wolfProvider/IDE/Android, then 'ln -s ../../ wolfProvider'
4849
if [ ! -e ${WORKSPACE}/wolfProvider ]; then
4950
git clone https://github.com/wolfssl/wolfProvider ${WORKSPACE}/wolfProvider
50-
cd ${WORKSPACE}/wolfProvider && \
51-
./autogen.sh && \
52-
./configure --with-openssl=${WORKSPACE}/openssl-install --with-wolfssl=${WORKSPACE}/wolfssl-install --host=x86_64-linux-android CFLAGS="-lm -fPIC" --enable-debug && \
53-
make -j
5451
fi
52+
cd ${WORKSPACE}/wolfProvider && \
53+
./autogen.sh && \
54+
./configure --with-openssl=${WORKSPACE}/openssl-install --with-wolfssl=${WORKSPACE}/wolfssl-install --host=x86_64-linux-android CFLAGS="-lm -fPIC" --enable-debug && \
55+
make -j

0 commit comments

Comments
 (0)