Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / system / bt / 68ff88c285dcc7f00a0dbe8c7274fbc76b7914c6
commit68ff88c285dcc7f00a0dbe8c7274fbc76b7914c6[log] [tgz]
authorJakub Pawlowski <jpawlowski@google.com>Mon Sep 23 22:27:12 2019 +0200
committerJakub Pawlowski <jpawlowski@google.com>Mon Sep 23 22:32:48 2019 +0200
treee90102df7fa744890c59ebd3dc4e0687dfc24e68
parentfdf6bc3dfafc773f8b4cbf2f378a57a07003b602 [diff]
Fix BLE device reconnections

Some BLE devices would advertise using both their RPA and Public
address. If such device was discovered using it's RPA, but later it's
overriden by Public address, we might have trouble reconnecting to it
due to the logic in whitelist handling code. This logic should prefer
Identity Address over any other type of address.

Test: Bond with BLE device, modify the AddrType in bt_config.conf file,
try to reconnect. We should use Address Type stored in LE_KEY_PID
Bug: 141186673
Bug: 139825901
Bug: 140847046
Change-Id: If27032f53dd655983ee5d5bc6d07b55d7458078f
1 file changed
tree: e90102df7fa744890c59ebd3dc4e0687dfc24e68
  1. audio_a2dp_hw/
  2. audio_bluetooth_hw/
  3. audio_hal_interface/
  4. audio_hearing_aid_hw/
  5. binder/
  6. bta/
  7. btcore/
  8. btif/
  9. build/
  10. common/
  11. conf/
  12. device/
  13. doc/
  14. embdrv/
  15. gd/
  16. hci/
  17. include/
  18. internal_include/
  19. linux_include/
  20. main/
  21. osi/
  22. packet/
  23. profile/
  24. proto/
  25. service/
  26. stack/
  27. test/
  28. tools/
  29. types/
  30. udrv/
  31. utils/
  32. vendor_libs/
  33. vnd/
  34. .clang-format
  35. .gitignore
  36. .gn
  37. Android.bp
  38. AndroidTestTemplate.xml
  39. BUILD.gn
  40. CleanSpec.mk
  41. EventLogTags.logtags
  42. MODULE_LICENSE_APACHE2
  43. NOTICE
  44. OWNERS
  45. PREUPLOAD.cfg
  46. README.md
  47. TEST_MAPPING
README.md

Fluoride Bluetooth stack

Building and running on AOSP

Just build AOSP - Fluoride is there by default.

Building and running on Linux

Instructions for Ubuntu, tested on 14.04 with Clang 3.5.0 and 16.10 with Clang 3.8.0

Download source

mkdir ~/fluoride
cd ~/fluoride
git clone https://android.googlesource.com/platform/system/bt

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 system/bt is checked out under AOSP, then create symbolic links instead of downloading sources

cd system/bt
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

Generate your build files

cd ~/fluoride/bt
gn gen out/Default

Build

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.

Run

cd ~/fluoride/bt/out/Default
LD_LIBRARY_PATH=./ ./bluetoothtbd -create-ipc-socket=fluoride

Eclipse IDE Support

  1. Follows the Chromium project Eclipse Setup Instructions until "Optional: Building inside Eclipse" section (don't do that section, we will set it up differently)

  2. Generate Eclipse settings:

cd system/bt
gn gen --ide=eclipse out/Default

  1. In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under system/bt/out/Default

  2. 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"

  3. Goto Behaviour tab, change clean command to "-t clean"