diff options
| author | 2024-01-08 10:40:32 -0800 | |
|---|---|---|
| committer | 2024-01-10 09:47:18 -0800 | |
| commit | 295bb332910973c78d174f4239cca8c8f0584a89 (patch) | |
| tree | 1403af4d117af9075d71e8c9fb6d1b4adb8a6056 | |
| parent | 177fd73f3b57dacf34b2f689c7fd47fdd978683c (diff) | |
Remove gd/ from message_loop_thread.h
Bug: 301661850
Test: mma -j32
Flag: EXEMPT, inclusion path changes
Change-Id: Ib1741d8afc9f80144995121bf05a4a23983a21d1
| -rw-r--r-- | system/common/Android.bp | 10 | ||||
| -rw-r--r-- | system/common/message_loop_thread.h | 4 | ||||
| -rw-r--r-- | system/stack/mmc/BUILD.gn | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/system/common/Android.bp b/system/common/Android.bp index 6fd7ff021d..c74926a516 100644 --- a/system/common/Android.bp +++ b/system/common/Android.bp @@ -124,7 +124,10 @@ cc_test { "mts_defaults", ], test_suites: ["general-tests"], - include_dirs: ["packages/modules/Bluetooth/system"], + include_dirs: [ + "packages/modules/Bluetooth/system", + "packages/modules/Bluetooth/system/gd", + ], host_supported: true, srcs: [ "test/thread_performance_test.cc", @@ -149,7 +152,10 @@ cc_benchmark { "fluoride_defaults", ], host_supported: true, - include_dirs: ["packages/modules/Bluetooth/system"], + include_dirs: [ + "packages/modules/Bluetooth/system", + "packages/modules/Bluetooth/system/gd", + ], srcs: [ "benchmark/thread_performance_benchmark.cc", ], diff --git a/system/common/message_loop_thread.h b/system/common/message_loop_thread.h index a8392f3000..3889c57a59 100644 --- a/system/common/message_loop_thread.h +++ b/system/common/message_loop_thread.h @@ -27,8 +27,8 @@ #include <thread> #include "abstract_message_loop.h" -#include "gd/common/contextual_callback.h" -#include "gd/common/i_postable_context.h" +#include "common/contextual_callback.h" +#include "common/i_postable_context.h" namespace bluetooth { diff --git a/system/stack/mmc/BUILD.gn b/system/stack/mmc/BUILD.gn index a3a85edf72..8111db73b6 100644 --- a/system/stack/mmc/BUILD.gn +++ b/system/stack/mmc/BUILD.gn @@ -38,6 +38,7 @@ group("mmc") { pkg_config("target_defaults") { include_dirs = [ "//bt/system", + "//bt/system/gd", "//bt/system/include", "//bt/system/stack", "//bt/system/stack/include", @@ -112,7 +113,6 @@ if (use.test) { "//bt/system/test/common/mock_functions.cc", ] include_dirs = [ - "//bt/system/gd", "//bt/system/types", ] configs += [ @@ -137,7 +137,6 @@ if (use.test) { "//bt/system/test/common/mock_functions.cc", ] include_dirs = [ - "//bt/system/gd", "//bt/system/types", ] configs += [ |