whitespace & cleanup
This commit is contained in:
parent
4271c743c7
commit
8587eab41c
|
@ -77,7 +77,7 @@ for arch in ${archs[@]}; do
|
||||||
file libssl.so
|
file libssl.so
|
||||||
cp libcrypto.a $TARGET_LIB_DIR
|
cp libcrypto.a $TARGET_LIB_DIR
|
||||||
cp libssl.a $TARGET_LIB_DIR
|
cp libssl.a $TARGET_LIB_DIR
|
||||||
|
|
||||||
cp -aL $SRC_DIR/openssl-OpenSSL_1_0_2l/include/openssl/ $TARGET_DIR/include
|
cp -aL $SRC_DIR/openssl-OpenSSL_1_0_2l/include/openssl/ $TARGET_DIR/include
|
||||||
# ln -sf $TARGET_DIR/include $TARGET_DIR/arm/include
|
# ln -sf $TARGET_DIR/include $TARGET_DIR/arm/include
|
||||||
|
|
||||||
|
|
|
@ -118,18 +118,18 @@ if [ -z "$ANDROID_TOOLCHAIN" ] || [ ! -d "$ANDROID_TOOLCHAIN" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case $_ANDROID_TARGET_SELECT in
|
case $_ANDROID_TARGET_SELECT in
|
||||||
arch-arm)
|
arch-arm)
|
||||||
ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld"
|
ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld"
|
||||||
;;
|
;;
|
||||||
arch-arm64-v8a)
|
arch-arm64-v8a)
|
||||||
ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-randlib aarch64-linux-android-ld"
|
ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-randlib aarch64-linux-android-ld"
|
||||||
;;
|
;;
|
||||||
arch-x86)
|
arch-x86)
|
||||||
ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld"
|
ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld"
|
||||||
;;
|
;;
|
||||||
arch-x86_64)
|
arch-x86_64)
|
||||||
ANDROID_TOOLS="x86_64-linux-android-gcc x86_64-linux-android-ranlib x86_64-linux-android-ld"
|
ANDROID_TOOLS="x86_64-linux-android-gcc x86_64-linux-android-ranlib x86_64-linux-android-ld"
|
||||||
;;
|
;;
|
||||||
arch-mips)
|
arch-mips)
|
||||||
ANDROID_TOOLS="mipsel-linux-android-gcc mipsel-linux-android-ranlib mipsel-linux-android-ld"
|
ANDROID_TOOLS="mipsel-linux-android-gcc mipsel-linux-android-ranlib mipsel-linux-android-ld"
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -25,7 +25,7 @@ for arch in ${archs[@]}; do
|
||||||
exit 16
|
exit 16
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
for package in ${packages[@]}; do
|
for package in ${packages[@]}; do
|
||||||
INPUT_DIR=`pwd`/build/build/$package
|
INPUT_DIR=`pwd`/build/build/$package
|
||||||
OUTPUT_DIR=`pwd`/$package/lib/$xarch
|
OUTPUT_DIR=`pwd`/$package/lib/$xarch
|
||||||
|
@ -36,7 +36,7 @@ for arch in ${archs[@]}; do
|
||||||
if [ $package = "monero" ]; then
|
if [ $package = "monero" ]; then
|
||||||
rm -rf $OUTPUT_DIR/../../include
|
rm -rf $OUTPUT_DIR/../../include
|
||||||
cp -a $INPUT_DIR/include $OUTPUT_DIR/../..
|
cp -a $INPUT_DIR/include $OUTPUT_DIR/../..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
|
@ -35,7 +35,7 @@ for arch in ${archs[@]}; do
|
||||||
if [ -f "$TARGET_DIR/lib/libsodium.la" ]; then
|
if [ -f "$TARGET_DIR/lib/libsodium.la" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p $TARGET_DIR
|
mkdir -p $TARGET_DIR
|
||||||
echo "building for ${arch}"
|
echo "building for ${arch}"
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ for arch in ${archs[@]}; do
|
||||||
rm -rf $TARGET_INC_DIR
|
rm -rf $TARGET_INC_DIR
|
||||||
mkdir -p $TARGET_INC_DIR
|
mkdir -p $TARGET_INC_DIR
|
||||||
cp -a $base_dir/src/wallet/api/wallet2_api.h $TARGET_INC_DIR
|
cp -a $base_dir/src/wallet/api/wallet2_api.h $TARGET_INC_DIR
|
||||||
|
|
||||||
cd $base_dir
|
cd $base_dir
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
version=v1.5.10.5
|
|
||||||
|
|
||||||
curl -O -L https://github.com/fuwa0529/wownerujo/releases/download/${version}/external-libs.tgz
|
|
||||||
|
|
||||||
rm -rf external-libs
|
|
||||||
|
|
||||||
echo "unpacking external-libs"
|
|
||||||
tar zxfv external-libs.tgz
|
|
||||||
rm external-libs.tgz
|
|
Loading…
Reference in New Issue