From 64da92bb612cf1016738335c3daea9034cc781a2 Mon Sep 17 00:00:00 2001
From: Jakub Pawlowski <jpawlowski@google.com>
Date: Wed, 19 Oct 2016 18:35:18 -0700
Subject: [PATCH] Move libhardware dependency to third_party folder on Linux
Thanks to this change we no longer have to configure paths by hand
Test: build with ninja
Change-Id: I04dfaa8f16e52a25efcc241019bae40d4201fb8b
---
README.md | 29 ++---------------------------
system/build/BUILD.gn | 11 +----------
system/service/BUILD.gn | 2 +-
3 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/README.md b/README.md
index 1350c00813e..8fb0909a676 100644
--- a/README.md
+++ b/README.md
@@ -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/system/build/BUILD.gn b/system/build/BUILD.gn
index c86e4076435..ebebf3d6669 100644
--- a/system/build/BUILD.gn
+++ b/system/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/system/service/BUILD.gn b/system/service/BUILD.gn
index 3a966b4ef4c..de10365ab8d 100644
--- a/system/service/BUILD.gn
+++ b/system/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 = [
--
GitLab