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

Commit 80acfa4b authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "floss: removing googletest manual build steps" am: 8cb769a2 am:... 

Merge "floss: removing googletest manual build steps" am: 8cb769a2 am: 4f169638 am: 1e51e62e am: 8e74efb8

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



Change-Id: I42aa2f033890925aa8dac9cfa8ca7dc3f3732a8f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2c19e53b 8e74efb8

README.md

+2 −21
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ sudo apt-get install repo git-core gnupg flex bison gperf build-essential \ 
  libprotobuf-dev ninja-build generate-ninja protobuf-compiler \

  libre2-9 debmake \

  llvm libc++abi-dev \

  libre2-dev libdouble-conversion-dev

  libre2-dev libdouble-conversion-dev \

  libgtest-dev libgmock-dev libabsl-dev

```



You will also need a recent-ish version of Rust and Cargo. Please follow the
@@ -89,26 +90,6 @@ popd 
sudo dpkg -i outdir/libchrome/*.deb

```



The googletest packages provided by Debian/Ubuntu (libgmock-dev and

libgtest-dev) do not provide pkg-config files, so you can build your own

googletest using the steps below:



```sh

git clone https://github.com/google/googletest.git -b release-1.10.0

cd googletest        # Main directory of the cloned repository.

mkdir build          # Create a directory to hold the build output.

cd build

cmake ..             # Generate native build scripts for GoogleTest.

sudo make install -DCMAKE_INSTALL_PREFIX=/usr



# Optional steps if pkgconfig isn't installed to desired location

# Modify the source (/usr/lib/x86_64-linux-gnu) and target (/usr/lib) based on

# your local installation.

for f in $(ls /usr/lib/x86_64-linux-gnu/pkgconfig/{gtest,gmock}*); do \

  ln -sf $f /usr/lib/pkgconfig/$(basename $f);

done

```



### Rust dependencies



**Note**: Handled by `--run-bootstrap` option.