Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aab11a0 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Floss: fix install dependencies script" am: 8ab5452f 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2078146



Change-Id: I6f4af076521ae44b2b64ea4c5e4ba703daa65095
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bbe68e0e 8ab5452f

system/build/dpkg/floss/install-dependencies

+4 −3
Original line number Diff line number Diff line
@@ -28,15 +28,16 @@ gnupg gperf libc++-dev libdbus-1-dev libevent-dev libflatbuffers-dev libflatbuff 
libgl1-mesa-dev libglib2.0-dev liblz4-tool libncurses5 libnss3-dev libprotobuf-dev libre2-9 \

libssl-dev libtinyxml2-dev libx11-dev libxml2-utils ninja-build openssl protobuf-compiler unzip \

x11proto-core-dev xsltproc zip zlib1g-dev libc++abi-dev cmake debmake ninja-build libgtest-dev \

libgmock-dev"

libgmock-dev libabsl-dev libre2-dev libdouble-conversion-dev bison clang llvm"



${DRY_RUN} sudo apt install ${APT_REQUIRED}



# Install rustup

curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh

source $HOME/.cargo/env

${DRY_RUN} rustup update



${DRY_RUN} cargo install cxxbridge-cmd || ctrl_c

${DRY_RUN} cargo install cxxbridge-cmd --version 1.0.42 || ctrl_c

${DRY_RUN} cargo install cargo-proc-macro || ctrl_c



echo "Building and installing modp-b64..."
@@ -65,7 +66,7 @@ fi 
# Put the GN binary in the bin...it isn't the right spot, but avoids adding a second directory

# to the environmental PATH

${DRY_RUN} mkdir -p ~/bin

${DRY_RUN} wget -O ~/bin/gn wget http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/gn-3e43fac03281e2f5e5ae5f27c8e9a6bb45966ea9.bin

${DRY_RUN} wget -O ~/bin/gn http://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/gn-3e43fac03281e2f5e5ae5f27c8e9a6bb45966ea9.bin

${DRY_RUN} chmod +x ~/bin/gn



rm -rf "${TMP_DIR}"