| commit | bdeabdb3df081a89c8b452a4b71af2e4865758d2 | [log] [tgz] |
|---|---|---|
| author | Michael Bestas <mkbestas@lineageos.org> | Sun Mar 09 07:40:54 2025 +0200 |
| committer | Michael Bestas <mkbestas@lineageos.org> | Sun Mar 09 07:40:54 2025 +0200 |
| tree | cbe11c40dfefcc62c4a9017cf5f8bd4893ef37c6 | |
| parent | c2414be0f423b5c018644ab0e7169deba265ccd9 [diff] | |
| parent | 6003569aeed2d30c3efbd106519d5c72040137e5 [diff] |
Merge tag 'android-15.0.0_r20' into staging/lineage-22.2_merge-android-15.0.0_r20 Android 15.0.0 Release 20 (BP1A.250305.019) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ8epbgAKCRDorT+BmrEO # eK8TAJ9CD4IrkOZBmbfE5fjliQHvZl/QcwCfUUvvvtuhoh8V44oyKmKnYHIZ9dM= # =4Yzb # -----END PGP SIGNATURE----- # gpg: Signature made Wed Mar 5 03:31:26 2025 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [ultimate] * tag 'android-15.0.0_r20': (875 commits) Remove flags for encrypted AVDTP & AVCTP channel Flag to retain identity address on BT restart Retain identity address LE-only devices on BT restart Retain identity address in device properties on BT restart Don't use config object after std::move Implement basic metrics for GATT. Notify socket disconnection event to socket hal Revert^2 "HCI Vendor Specific Interface needs to be mocked for testing" Reduce test contact data Revert "HCI Vendor Specific Interface needs to be mocked for testing" Fix a test Add missing flag of socket_settings_api HCI Vendor Specific Interface needs to be mocked for testing Set all-zero of peer address, peer address type, and peer IRK in resolving list for RPA offload Early flag removal for ble_scan_setting Add system property for rpa_offload_to_bt_controller Fix issue with importing audio framework flag library Revert "Make SetBrowsedPlayer return current path and correct item count." ADM: fix active device fallback on handleHfpActiveDeviceChanged Added 50ms delay after onSetReport() RPC call ... Conflicts: system/gd/hci/controller.cc system/gd/hci/hci_layer.cc Change-Id: If44fe2e710092e8be224fd6e4b4ad5215b29eacf
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 libfmt-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 \ libgtest-dev libgmock-dev libabsl-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
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