diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2016-02-25 12:16:31 -0800 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2016-03-25 11:55:23 -0700 |
| commit | 5caf67e0f604c407a8b9b4987b0a161165feb90b (patch) | |
| tree | dc4216d250240867c38af789a2770861b09182f8 /build | |
| parent | 2998946db9b820806d4a3e6decf1d01f090a8031 (diff) | |
| download | android_system_bt-5caf67e0f604c407a8b9b4987b0a161165feb90b.tar.gz android_system_bt-5caf67e0f604c407a8b9b4987b0a161165feb90b.tar.bz2 android_system_bt-5caf67e0f604c407a8b9b4987b0a161165feb90b.zip | |
Build on linux: final changes and instructions.
After this patch anyone should be able to build Fluoride on Linux.
Bug: 27324453
Change-Id: I7776be12591b8fed6d38fc0375019606d311ddb9
Diffstat (limited to 'build')
| -rw-r--r-- | build/BUILD.gn | 4 | ||||
| -rw-r--r-- | build/secondary/third_party/libchrome/BUILD.gn | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/build/BUILD.gn b/build/BUILD.gn index 151869dd3..42b530c2e 100644 --- a/build/BUILD.gn +++ b/build/BUILD.gn @@ -55,7 +55,9 @@ config("linux") { cflags_c = [ "-std=c99" ] cflags_cc = [ - "-std=c++11", +#TODO(jpawlowski): we should use same c++ version as Android, which is c++11, +# but we use some c++14 features. Uncomment when this get fixed in code.: + "-std=c++14", "-fno-exceptions", ] diff --git a/build/secondary/third_party/libchrome/BUILD.gn b/build/secondary/third_party/libchrome/BUILD.gn index 48f82c6ac..167cb4000 100644 --- a/build/secondary/third_party/libchrome/BUILD.gn +++ b/build/secondary/third_party/libchrome/BUILD.gn @@ -212,18 +212,21 @@ source_set("base_sources") { include_dirs = [ "//", + "//third_party/googletest/googletest/include", "//third_party/libchrome", "//third_party/libevent", "//third_party/libevent/include", "//third_party/libchrome/base", "//third_party/modp_b64", - "//third_party/gtest/include", ] } config("libchrome_config") { # libchrome headers need to be able to find themselves. - include_dirs = [ "//third_party/libchrome" ] + include_dirs = [ + "//third_party/googletest/googletest/include", + "//third_party/libchrome", + ] } static_library("base") { |