Skip to content

Commit 423f024

Browse files
committed
Build working copy of srt
1 parent ac6ec62 commit 423f024

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

scripts/build-android/build-android

+1-12
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ echo_help()
1010
echo " -e Encryption library to be used. Possible options: openssl (default) mbedtls"
1111
echo " -o OpenSSL version. E.g. 1.1.1l"
1212
echo " -m Mbed TLS version. E.g. v2.26.0"
13-
echo " -s SRT version. E.g. v1.4.4"
1413
echo
1514
echo "Example: ./build-android -n /home/username/Android/Sdk/ndk/23.0.7599858 -a 28 -t \"arm64-v8a x86_64\""
1615
echo
@@ -21,7 +20,6 @@ NDK_ROOT=""
2120
API_LEVEL=28
2221
BUILD_TARGETS="armeabi-v7a arm64-v8a x86 x86_64"
2322
OPENSSL_VERSION=1.1.1l
24-
SRT_VERSION=""
2523
ENC_LIB=openssl
2624
MBEDTLS_VERSION=v2.26.0
2725

@@ -56,10 +54,8 @@ SCRIPT_DIR=$(pwd)
5654
HOST_TAG='unknown'
5755
unamestr=$(uname -s)
5856
if [ "$unamestr" = 'Linux' ]; then
59-
SCRIPT_DIR=$(readlink -f $0 | xargs dirname)
6057
HOST_TAG='linux-x86_64'
6158
elif [ "$unamestr" = 'Darwin' ]; then
62-
SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
6359
if [ $(uname -p) = 'arm' ]; then
6460
echo "NDK does not currently support ARM64"
6561
exit 128
@@ -93,13 +89,6 @@ else
9389
exit 128
9490
fi
9591

96-
if [ ! -d $BASE_DIR/srt ]; then
97-
git clone https://github.com/Haivision/srt srt
98-
if [ ! -z "$SRT_VERSION" ]; then
99-
git -C $BASE_DIR/srt checkout $SRT_VERSION
100-
fi
101-
fi
102-
10392
for build_target in $BUILD_TARGETS; do
10493
LIB_DIR=$BASE_DIR/$build_target/lib
10594
JNI_DIR=$BASE_DIR/prebuilt/$build_target
@@ -114,6 +103,6 @@ for build_target in $BUILD_TARGETS; do
114103
fi
115104

116105
git -C $BASE_DIR/srt clean -fd
117-
$SCRIPT_DIR/mksrt -n $NDK_ROOT -a $API_LEVEL -t $build_target -e $ENC_LIB -s $BASE_DIR/srt -i $BASE_DIR/$build_target
106+
$SCRIPT_DIR/mksrt -n $NDK_ROOT -a $API_LEVEL -t $build_target -e $ENC_LIB -s ../.. -i $BASE_DIR/$build_target
118107
cp $LIB_DIR/libsrt.so $JNI_DIR/libsrt.so
119108
done

0 commit comments

Comments
 (0)