liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'build-fixes' into 'main'

Browse Source 
Build fixes

See merge request veilid/veilid!198
This commit is contained in:
Christien Rioux
2023-09-21 22:00:24 +00:00
parent 9b1bc5d9a2 0a7f21ce00
commit e2b86cbcbc
19 changed files with 175 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dev-setup/setup_macos.sh
View File

@@ -27,6 +27,9 @@ else
exit 1
fi
# ensure Android SDK packages are installed
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33
# ensure ANDROID_NDK_HOME is defined and exists
if [ -d "$ANDROID_NDK_HOME" ]; then
echo '[X] $ANDROID_NDK_HOME is defined and exists'
@@ -129,12 +132,6 @@ if [ "$BREW_USER" == "" ]; then
fi
sudo -H -u $BREW_USER brew install capnp cmake wabt llvm protobuf openjdk@17 jq
case $response in
[yY] ) echo Checking android sdk packages are installed...;
# Ensure android sdk packages are installed
$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager build-tools\;33.0.1 ndk\;25.1.8937393 cmake\;3.22.1 platform-tools platforms\;android-33
esac
# install targets
rustup target add aarch64-apple-darwin aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-darwin x86_64-apple-ios wasm32-unknown-unknown aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android