| commit | 0480ff3dd26cd491fc1b02a0d541d9857a69a354 | [log] [tgz] |
|---|---|---|
| author | Ugo Yu <ugoyu@google.com> | Mon Aug 08 19:14:46 2022 +0800 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Jan 18 01:58:47 2023 +0000 |
| tree | 1d898661a7fe592716dd4fc4b61de561b7d779c4 | |
| parent | e5e357d151b80cfa34c65b2a8fc2de02006942ac [diff] |
Handle AVDT_SCB_HDL_TC_CLOSE in avdt_scb idle state Fix an issue of if the remote device disconnect AVDTP before it is configured, the avdt_scb state machine ingores the close event and cause the bta_av state machine stuck at INCOMING state. The issue is: 1. remote initiates AVDTP connection, bta_av_ssm switches to INCOMING state 2. bta_av_accept_signalling_timer_cback() timer is fired, in case the remote device (AVDTP initiator) does not send discovery. 3. remote send discovery and found out we don't have A2DP sink, then disconnect. 4. avdt_scb ignores the L2C disconnection in IDLE state, makes the bta_av_ssm stays at INCOMING state. 5. bta_av_accept_signalling_timer_cback() timed out, and notice that bta_av_ssm is still in INCOMING state, it assumes that the remote did not finish discovery, so it starts a new discovery procedure. This change makes the avdt_scb handle L2C close in idle state so the bta_av_ssm does not stuck at INCOMING state if the L2C link is disconnected before the AVDTP is configured. Cherry picked from wear OS Bug: 263323082 Bug: 239833275 Test: Manual Change-Id: I629f44f477ffe111112db70738fb4241e179684d (cherry picked from commit e440c1acacf0b53a0460475b0ecca5a74d552aec) (cherry picked from commit a66bb86d9f019d985215083a2c35866f84d5481b) Merged-In: I629f44f477ffe111112db70738fb4241e179684d
Just build AOSP - Fluoride is there by default.
Instructions for a Debian based distribution:
You'll want to download some pre-requisite packages as well. If you're currently configured for AOSP development, you should have most required packages. Otherwise, you can use the following apt-get list or use the --run-bootstrap option on build.py (see below) to get a list of packages missing on your system:
sudo apt-get install repo git-core gnupg flex bison gperf build-essential \ zip curl zlib1g-dev gcc-multilib g++-multilib \ x11proto-core-dev libx11-dev libncurses5 \ libgl1-mesa-dev libxml2-utils xsltproc unzip liblz4-tool libssl-dev \ libc++-dev libevent-dev \ flatbuffers-compiler libflatbuffers1 openssl \ libflatbuffers-dev libtinyxml2-dev \ libglib2.0-dev libevent-dev libnss3-dev libdbus-1-dev \ libprotobuf-dev ninja-build generate-ninja protobuf-compiler \ libre2-9 debmake \ llvm libc++abi-dev \ libre2-dev libdouble-conversion-dev
You will also need a recent-ish version of Rust and Cargo. Please follow the instructions on Rustup to install a recent version.
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/packages/modules/Bluetooth
build.py is the helper script used to build Fluoride for Linux (i.e. Floss). It accepts a --run-bootstrap option that will set up your build staging directory and also make sure you have all required system packages to build (should work on Debian and Ubuntu). You will still need to build some unpackaged dependencies (like libchrome, modp_b64, googletest, etc).
To use it:
./build.py --run-bootstrap
This will install your bootstrapped build environment to ~/.floss. If you want to change this, just pass in --bootstrap-dir to the script.
The following third-party dependencies are necessary but currently unavailable via a package manager. You may have to build these from source and install them to your local environment.
We provide a script to produce debian packages for those components. Please see the instructions in build/dpkg/README.txt for more details.
cd system/build/dpkg mkdir -p outdir/{modp_b64,libchrome} # Build and install modp_b64 pushd modp_b64 ./gen-src-pkg.sh $(readlink -f ../outdir/modp_b64) popd sudo dpkg -i outdir/modp_b64/*.deb # Build and install libchrome pushd libchrome ./gen-src-pkg.sh $(readlink -f ../outdir/libchrome) 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:
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
Note: Handled by --run-bootstrap option.
Run the following to install Rust dependencies:
cargo install cxxbridge-cmd
Note: Handled by --run-bootstrap option.
For host build, we depend on a few other repositories:
Clone these all somewhere and create your staging environment.
export STAGING_DIR=path/to/your/staging/dir mkdir ${STAGING_DIR} mkdir -p ${STAGING_DIR}/external ln -s $(readlink -f ${PLATFORM2_DIR}/common-mk) ${STAGING_DIR}/common-mk ln -s $(readlink -f ${PLATFORM2_DIR}/.gn) ${STAGING_DIR}/.gn ln -s $(readlink -f ${RUST_CRATE_DIR}) ${STAGING_DIR}/external/rust ln -s $(readlink -f ${PROTO_LOG_DIR}) ${STAGING_DIR}/external/proto_logging
We provide a build script to automate building assuming you've staged your build environment already as above. At this point, make sure you have all the pre-requisites installed (i.e. bootstrap option and other dependencies above) or you will see failures. In addition, you may need to set a --libdir= if your libraries are not stored in /usr/lib by default.
./build.py
This will build all targets to the output directory at --bootstrap-dir (which defaults to ~/.floss). You can also build each stage separately (if you want to iterate on something specific):
You can choose to run only a specific stage by passing an arg via --target.
Currently, Rust builds are a separate stage that uses Cargo to build. See gd/rust/README.md for more information. If you are iterating on Rust code and want to add new crates, you may also want to use the --no-vendored-rust option (which will let you use crates.io instead of using a pre-populated vendored crates repo).
By default on Linux, we statically link libbluetooth so you can just run the binary directly. By default, it will try to run on hci0 but you can pass it --hci=N, where N corresponds to /sys/class/bluetooth/hciN.
$OUTPUT_DIR/debug/btadapterd --hci=$HCI INIT_gd_hci=true