diff options
| -rw-r--r-- | README.md | 29 | ||||
| -rw-r--r-- | build/BUILD.gn | 11 | ||||
| -rw-r--r-- | service/BUILD.gn | 2 |
3 files changed, 4 insertions, 38 deletions
@@ -63,6 +63,7 @@ git clone https://github.com/google/googletest.git git clone https://android.googlesource.com/platform/external/libchrome git clone https://android.googlesource.com/platform/external/modp_b64 git clone https://android.googlesource.com/platform/external/tinyxml2 +git clone https://android.googlesource.com/platform/hardware/libhardware ``` And third party dependencies of third party dependencies: @@ -75,33 +76,7 @@ curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/va curl https://chromium.googlesource.com/chromium/src/base/+/master/third_party/valgrind/memcheck.h?format=TEXT | base64 -d > memcheck.h ``` -Fluoride currently has dependency on some internal Android projects, which also need to be downloaded. This will be removed in future: - -```sh -cd ~/fluoride -git clone https://android.googlesource.com/platform/hardware/libhardware -``` - -### Configure your build -We need to configure some paths to make the build successful. Run: - -```sh -cd ~/fluoride/bt -gn args out/Default -``` - -This will prompt you to fill the contents of your "out/Default/args.gn" file. Make it look like below. Replace "/home/job" with path to your home directory, and don't use "~" in build arguments: - -```sh -# Build arguments go here. Examples: -# is_component_build = true -# is_debug = false -# See "gn args <out_dir> --list" for available build arguments. - -libhw_include_path = "/home/job/fluoride/libhardware/include" -``` - -Then generate your build files by calling +### Generate your build files ```sh cd ~/fluoride/bt diff --git a/build/BUILD.gn b/build/BUILD.gn index c86e40764..ebebf3d66 100644 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -14,18 +14,9 @@ # limitations under the License. # -declare_args() { - # Include path for hardware/bluetooth.h - libhw_include_path = "" -} - config("default_include_dirs") { - # TODO(armansito): Remove "core_include_path" once the cutils includes have - # been removed. - assert(libhw_include_path != "", - "libhardware_include_path build argument wasn't provided.") include_dirs = [ - libhw_include_path, + "//third_party/libhardware/include/", ] } diff --git a/service/BUILD.gn b/service/BUILD.gn index 3a966b4ef..de10365ab 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -51,7 +51,7 @@ source_set("service") { "//", "//service/common", "//third_party/modp_b64/modp64", - libhw_include_path, + "//third_party/libhardware/include", ] deps = [ |