commit | ff38d891932a138c583e1dd8d2d60a973ababa48 | [log] [tgz] |
---|---|---|
author | Jack He <siyuanh@google.com> | Thu Oct 03 17:11:07 2019 -0700 |
committer | Jack He <siyuanh@google.com> | Thu Oct 03 18:42:47 2019 -0700 |
tree | e62c601beae00763b4249c72d9380639213629d6 | |
parent | 4e4903297c1dc06d5193d94466b337ce0a431f23 [diff] |
Split L2CAP Classic and LE stacks into separate modules * Although L2CAP LE and Classic stacks look similar, they are actually very different when diving into details * Splitting them into two separate modules will benefit in the following ways: * One can start a LE only stack * One can turn off Classic stack entirely when not needed * Dependencies are more obvious, e.g. LE-CoC only depends on LE L2CAP and A2DP only depends on Classic L2CAP * Changed test names as GTEST does not allow test name collisions * New directory structure after the change: - l2cap: common headers that should be exposed to public - internal: common internal libraries shared between LE and classic - classic: classic headers that should be exposed to public - internal: internal libraries for classic - cert: certification stack for classic - le: LE headers that should be exposed to public - internal: internal libraries for LE - cert: certification stack for LE Using Bash for file in classic_*; do git mv "$file" "classic/${file/classic_/}"; done for file in le_*; do git mv "$file" "le/${file/le_/}"; done for file in internal/le_*; do git mv "$file" "le/${file/le_/}"; done for file in internal/classic_*; do git mv "$file" "classic/${file/classic_/}"; done for file in classic/*; do if [ -f "$file" ]; then sed -i -e 's/Classic//g' "$file"; fi; done for file in classic/internal/*; do if [ -f "$file" ]; then sed -i -e 's/Classic//g' "$file"; fi; done for file in le/*; do if [ -f "$file" ]; then sed -i -e 's/Le//g' "$file"; fi; done for file in le/internal/*; do if [ -f "$file" ]; then sed -i -e 's/Le//g' "$file"; fi; done Using IDE: replace "namespace l2cap {" with "namespace l2cap { namespace classic {" in classic/ replace "} // namespace l2cap" with "} }" in classic/ replace "namespace l2cap {" with "namespace l2cap { namespace le {" in le/ replace "} // namespace l2cap" with "} }" in le/ replace "l2cap/classic_" with "l2cap/classic/" in classic/ replace "l2cap/internal/classic_" with "l2cap/classic/internal/" in classic/ replace "l2cap/le_" with "l2cap/le/" in le/ replace "l2cap/internal/le_" with "l2cap/le/internal/" in le/ Bug: 140938432 Test: bluetooth_test_gd Change-Id: I29eafefc5b6be4033e5db811776230d28ca312b2
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/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
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 system/bt gn gen --ide=eclipse out/Default
In Eclipse, do File->Import->C/C++->C/C++ Project Settings, choose the XML location under system/bt/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"