Add btif/include when including from outside btif

Bug: 301661850
Test: mma -j32
Flag: EXEMPT, inclusion path changes
Change-Id: I4adde102393392378cdd44059cb3a63648857961

21 files changed, 23 insertions, 37 deletions

diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 0f8cb58b73..935cd08737 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -15,7 +15,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
diff --git a/system/audio_hal_interface/a2dp_encoding_host.cc b/system/audio_hal_interface/a2dp_encoding_host.cc
index 7c038afd52..6b717abaee 100644
--- a/system/audio_hal_interface/a2dp_encoding_host.cc
+++ b/system/audio_hal_interface/a2dp_encoding_host.cc
@@ -23,9 +23,9 @@
 #include <vector>
 
 #include "a2dp_encoding.h"
-#include "btif_a2dp_source.h"
-#include "btif_av.h"
-#include "btif_hf.h"
+#include "btif/include/btif_a2dp_source.h"
+#include "btif/include/btif_av.h"
+#include "btif/include/btif_hf.h"
 #include "os/log.h"
 #include "stack/include/avdt_api.h"
 #include "types/raw_address.h"
diff --git a/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h
index 53c869233e..71f4793bd4 100644
--- a/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h
+++ b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h
@@ -21,10 +21,10 @@
 #include "a2dp_encoding.h"
 #include "a2dp_sbc_constants.h"
 #include "audio_a2dp_hw/include/audio_a2dp_hw.h"
-#include "btif_a2dp_source.h"
-#include "btif_av.h"
-#include "btif_av_co.h"
-#include "btif_hf.h"
+#include "btif/include/btif_a2dp_source.h"
+#include "btif/include/btif_av.h"
+#include "btif/include/btif_av_co.h"
+#include "btif/include/btif_hf.h"
 #include "common/message_loop_thread.h"
 #include "osi/include/log.h"
 #include "osi/include/properties.h"
diff --git a/system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc b/system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc
index 63bfc917bd..7375837b3a 100644
--- a/system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc
+++ b/system/audio_hal_interface/aidl/hfp_client_interface_aidl.cc
@@ -22,7 +22,7 @@
 #include "aidl/android/hardware/bluetooth/audio/AudioConfiguration.h"
 #include "aidl/transport_instance.h"
 #include "bta/ag/bta_ag_int.h"
-#include "btif_hf.h"
+#include "btif/include/btif_hf.h"
 #include "btm_api_types.h"
 #include "hardware/bluetooth.h"
 #include "hardware/bluetooth_headset_interface.h"
diff --git a/system/audio_hal_interface/hidl/a2dp_encoding_hidl.cc b/system/audio_hal_interface/hidl/a2dp_encoding_hidl.cc
index b0dac812bd..77d3a434ed 100644
--- a/system/audio_hal_interface/hidl/a2dp_encoding_hidl.cc
+++ b/system/audio_hal_interface/hidl/a2dp_encoding_hidl.cc
@@ -20,10 +20,10 @@
 #include <vector>
 
 #include "a2dp_sbc_constants.h"
-#include "btif_a2dp_source.h"
-#include "btif_av.h"
-#include "btif_av_co.h"
-#include "btif_hf.h"
+#include "btif/include/btif_a2dp_source.h"
+#include "btif/include/btif_av.h"
+#include "btif/include/btif_av_co.h"
+#include "btif/include/btif_hf.h"
 #include "client_interface_hidl.h"
 #include "codec_status_hidl.h"
 #include "osi/include/properties.h"
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 6c10838229..d5480a1aab 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -21,7 +21,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btif/avrcp",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/include",
@@ -484,7 +483,6 @@ cc_test {
         "packages/modules/Bluetooth/system/bta/groups",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/test/common",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/osi/include",
     ],
     srcs: [
@@ -730,7 +728,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/test/common",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
@@ -807,7 +804,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/test/common",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
@@ -1008,7 +1004,6 @@ cc_test {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/le_audio",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/include",
     ],
@@ -1065,7 +1060,6 @@ cc_test {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/le_audio",
         "packages/modules/Bluetooth/system/bta/test/common",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/include",
     ],
diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index b8dcef8224..3a05a64f59 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -35,7 +35,7 @@
 #include "bta_groups.h"
 #include "bta_le_audio_uuids.h"
 #include "bta_sec_api.h"
-#include "btif_storage.h"
+#include "btif/include/btif_storage.h"
 #include "common/init_flags.h"
 #include "crypto_toolbox/crypto_toolbox.h"
 #include "csis_types.h"
diff --git a/system/bta/csis/csis_client_test.cc b/system/bta/csis/csis_client_test.cc
index 10e4442ccf..515c1fdacd 100644
--- a/system/bta/csis/csis_client_test.cc
+++ b/system/bta/csis/csis_client_test.cc
@@ -27,7 +27,7 @@
 #include "bta_gatt_api_mock.h"
 #include "bta_gatt_queue_mock.h"
 #include "bta_le_audio_uuids.h"
-#include "btif_profile_storage.h"
+#include "btif/include/btif_profile_storage.h"
 #include "btm_api_mock.h"
 #include "csis_types.h"
 #include "gatt/database_builder.h"
diff --git a/system/bta/csis/csis_types.h b/system/bta/csis/csis_types.h
index 25b43a6063..a1dd4dad4d 100644
--- a/system/bta/csis/csis_types.h
+++ b/system/bta/csis/csis_types.h
@@ -26,7 +26,7 @@
 #include "bta_csis_api.h"
 #include "bta_gatt_api.h"
 #include "bta_groups.h"
-#include "btif_storage.h"
+#include "btif/include/btif_storage.h"
 #include "common/init_flags.h"
 #include "common/strings.h"
 #include "crypto_toolbox/crypto_toolbox.h"
diff --git a/system/bta/groups/groups.cc b/system/bta/groups/groups.cc
index 1497c9d570..feeb7a32cd 100644
--- a/system/bta/groups/groups.cc
+++ b/system/bta/groups/groups.cc
@@ -24,7 +24,7 @@
 #include <unordered_set>
 
 #include "bta_groups.h"
-#include "btif_profile_storage.h"
+#include "btif/include/btif_profile_storage.h"
 #include "os/logging/log_adapter.h"
 #include "stack/include/bt_types.h"
 #include "types/bluetooth/uuid.h"
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index a6dca32728..e60554d801 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -31,7 +31,7 @@
 #include "bta_gatt_queue.h"
 #include "bta_groups.h"
 #include "bta_le_audio_api.h"
-#include "btif_profile_storage.h"
+#include "btif/include/btif_profile_storage.h"
 #include "btm_iso_api.h"
 #include "client_parser.h"
 #include "codec_interface.h"
diff --git a/system/bta/le_audio/device_groups.cc b/system/bta/le_audio/device_groups.cc
index 1677487d28..aeab41d726 100644
--- a/system/bta/le_audio/device_groups.cc
+++ b/system/bta/le_audio/device_groups.cc
@@ -20,7 +20,7 @@
 
 #include "bta/include/bta_gatt_api.h"
 #include "bta_csis_api.h"
-#include "btif_storage.h"
+#include "btif/include/btif_profile_storage.h"
 #include "btm_iso_api.h"
 #include "device/include/controller.h"
 #include "internal_include/bt_trace.h"
diff --git a/system/bta/le_audio/devices.cc b/system/bta/le_audio/devices.cc
index 0e8b267778..674269dadf 100644
--- a/system/bta/le_audio/devices.cc
+++ b/system/bta/le_audio/devices.cc
@@ -22,7 +22,7 @@
 #include "acl_api.h"
 #include "android_bluetooth_flags.h"
 #include "bta_gatt_queue.h"
-#include "btif_storage.h"
+#include "btif/include/btif_storage.h"
 #include "internal_include/bt_trace.h"
 
 using bluetooth::hci::kIsoCigPhy1M;
diff --git a/system/gd/l2cap/fuzz/Android.bp b/system/gd/l2cap/fuzz/Android.bp
index 7bcbfb7463..72194fd61a 100644
--- a/system/gd/l2cap/fuzz/Android.bp
+++ b/system/gd/l2cap/fuzz/Android.bp
@@ -17,7 +17,6 @@ cc_fuzz {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/co",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/gd",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 3bef984e96..9f1fab3592 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -32,7 +32,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/co",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/gd",
@@ -79,7 +78,6 @@ cc_library {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/co",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/stack/a2dp",
@@ -132,7 +130,6 @@ cc_library_static {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
     ],
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index a076f462f9..fe68a2be69 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -37,6 +37,7 @@ cc_test {
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system/",
+        "packages/modules/Bluetooth/system/gd",
     ],
     srcs: [
         "common/test/data_element_reader_test.cc",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 662ed58e68..5c137cca1b 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -67,7 +67,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/device/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/gd/hal",
@@ -201,7 +200,6 @@ cc_library_static {
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/udrv/include",
     ],
@@ -1118,7 +1116,6 @@ cc_test {
         "external/libldac/inc",
         "external/libopus/include",
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/embdrv/encoder_for_aptxhd/include",
         "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/stack/include",
diff --git a/system/stack/a2dp/a2dp_vendor_aptx.cc b/system/stack/a2dp/a2dp_vendor_aptx.cc
index d51bafb4b8..f718225b3b 100644
--- a/system/stack/a2dp/a2dp_vendor_aptx.cc
+++ b/system/stack/a2dp/a2dp_vendor_aptx.cc
@@ -30,7 +30,7 @@
 
 #include "a2dp_vendor.h"
 #include "a2dp_vendor_aptx_encoder.h"
-#include "btif_av_co.h"
+#include "btif/include/btif_av_co.h"
 #include "include/check.h"
 #include "internal_include/bt_trace.h"
 #include "os/log.h"
diff --git a/system/stack/a2dp/a2dp_vendor_aptx_hd.cc b/system/stack/a2dp/a2dp_vendor_aptx_hd.cc
index 06574d4abf..a8d0942706 100644
--- a/system/stack/a2dp/a2dp_vendor_aptx_hd.cc
+++ b/system/stack/a2dp/a2dp_vendor_aptx_hd.cc
@@ -30,7 +30,7 @@
 
 #include "a2dp_vendor.h"
 #include "a2dp_vendor_aptx_hd_encoder.h"
-#include "btif_av_co.h"
+#include "btif/include/btif_av_co.h"
 #include "include/check.h"
 #include "internal_include/bt_trace.h"
 #include "os/log.h"
diff --git a/system/stack/a2dp/a2dp_vendor_ldac.cc b/system/stack/a2dp/a2dp_vendor_ldac.cc
index 65e8991778..72a7c7b836 100644
--- a/system/stack/a2dp/a2dp_vendor_ldac.cc
+++ b/system/stack/a2dp/a2dp_vendor_ldac.cc
@@ -30,7 +30,7 @@
 
 #include "a2dp_vendor_ldac_decoder.h"
 #include "a2dp_vendor_ldac_encoder.h"
-#include "btif_av_co.h"
+#include "btif/include/btif_av_co.h"
 #include "internal_include/bt_trace.h"
 #include "os/log.h"
 #include "osi/include/osi.h"
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 2bc2794552..171435c5e1 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -19,7 +19,6 @@ cc_defaults {
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/avrcp",
         "packages/modules/Bluetooth/system/btif/co",
-        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/device/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",