Page MenuHomePhabricator

D4716.id15245.diff
No OneTemporary

D4716.id15245.diff

diff --git a/native/android/app/bash/build_openssl.sh b/native/android/app/bash/build_openssl.sh
--- a/native/android/app/bash/build_openssl.sh
+++ b/native/android/app/bash/build_openssl.sh
@@ -44,7 +44,7 @@
readonly BUILD_PREFIX=$3
echo "Building OpenSSL library for ${BUILD_PREFIX} (${TARGET_ARCH})"
- cd $OPENSSL_SUBMODULE_PATH
+ cd "$OPENSSL_SUBMODULE_PATH"
# Compilation flags:
export CFLAGS="-Os -ffunction-sections -fdata-sections -fno-unwind-tables -fno-asynchronous-unwind-tables"
@@ -53,13 +53,13 @@
export TARGET_HOST=${TARGET_ARCH}
PATH=$TOOLCHAIN/bin:$PATH
- ./config no-asm -Wl,--enable-new-dtags,-rpath,'$(LIBRPATH)'
- ./Configure ${BUILD_ARCH} no-shared \
- -D__ANDROID_API__=$MIN_SDK_VERSION \
- --prefix=$OPENSSL_SUBMODULE_PATH/build/${BUILD_PREFIX}
+ ./config no-asm -Wl,--enable-new-dtags,-rpath,"$(LIBRPATH)"
+ ./Configure "${BUILD_ARCH}" no-shared \
+ -D__ANDROID_API__="$MIN_SDK_VERSION" \
+ --prefix="$OPENSSL_SUBMODULE_PATH"/build/"${BUILD_PREFIX}"
make -j"$THREADS"
make install_sw
make clean
}
-CONFIGURE_AND_BUILD $TARGET_ARCH $BUILD_ARCH $ANDROID_ARCH_ABI
+CONFIGURE_AND_BUILD "$TARGET_ARCH" $BUILD_ARCH "$ANDROID_ARCH_ABI"

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 2:31 AM (21 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2208502
Default Alt Text
D4716.id15245.diff (1 KB)

Event Timeline