commit | 6b34addbc1ddb0ea63b9d9cc55c833f7b649081c | [log] [tgz] |
---|---|---|
author | Cheney Ni <cheneyni@google.com> | Tue Jul 17 19:27:59 2018 +0800 |
committer | Cheney Ni <cheneyni@google.com> | Tue Jul 24 13:50:49 2018 +0800 |
tree | 556d40e78c77d5d733287372e6ffe778f6cd22af | |
parent | 8925a69a6011e8f3f6b1f59dbd33c0bd91961dfb [diff] |
Ignore SDP failure while bonding if SDP was not attempted When bonding, there is an ACL_UP event to the upper layers and some apps may want to fetch SDP in return. This can break pairing. In cases SDP fails, it causes the procedure to be finished before the LinkKey is generated. And thus the LinkKey is not committed to NVRAM and the device is not paired. Bug: 111189110 Test: : Pair / Unpair BT accessories manually Change-Id: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8 Merged-In: Iaefbe8b6c1fc3e78f0f120220992df84699a2eb8 (cherry picked from commit 22062116af942ab63120f098987ecf2d645ea0e9)
Just build AOSP - Fluoride is there by default.
Instructions for Ubuntu, tested on 14.04 with Clang 3.5.0 and 16.10 with Clang 3.8.0
mkdir ~/fluoride cd ~/fluoride git clone https://android.googlesource.com/platform/packages/modules/Bluetooth/system
Install dependencies (require sudo access):
cd ~/fluoride/bt build/install_deps.sh
Then fetch third party dependencies:
cd ~/fluoride/bt mkdir third_party cd third_party git clone https://github.com/google/googletest.git git clone https://android.googlesource.com/platform/external/aac git clone https://android.googlesource.com/platform/external/libchrome git clone https://android.googlesource.com/platform/external/libldac git clone https://android.googlesource.com/platform/external/modp_b64 git clone https://android.googlesource.com/platform/external/tinyxml2
And third party dependencies of third party dependencies:
cd fluoride/bt/third_party/libchrome/base/third_party mkdir valgrind cd valgrind curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/valgrind.h?format=TEXT | base64 -d > valgrind.h curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/memcheck.h?format=TEXT | base64 -d > memcheck.h
NOTE: If packages/modules/Bluetooth/system is checked out under AOSP, then create symbolic links instead of downloading sources
cd packages/modules/Bluetooth/system mkdir third_party cd third_party ln -s ../../../external/aac aac ln -s ../../../external/libchrome libchrome ln -s ../../../external/libldac libldac ln -s ../../../external/modp_b64 modp_b64 ln -s ../../../external/tinyxml2 tinyxml2 ln -s ../../../external/googletest googletest
cd ~/fluoride/bt gn gen out/Default
cd ~/fluoride/bt ninja -C out/Default all
This will build all targets (the shared library, executables, tests, etc) and put them in out/Default. To build an individual target, replace "all" with the target of your choice, e.g. ninja -C out/Default net_test_osi
.
cd ~/fluoride/bt/out/Default LD_LIBRARY_PATH=./ ./bluetoothtbd -create-ipc-socket=fluoride
Follows the Chromium project Eclipse Setup Instructions until "Optional: Building inside Eclipse" section (don't do that section, we will set it up differently)
Generate Eclipse settings:
cd packages/modules/Bluetooth/system gn gen --ide=eclipse out/Default
In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under packages/modules/Bluetooth/system/out/Default
Right click on the project. Go to Preferences->C/C++ Build->Builder Settings. Uncheck "Use default build command", but instead using "ninja -C out/Default"
Goto Behaviour tab, change clean command to "-t clean"