diff options
author | 2024-02-09 22:09:54 +0000 | |
---|---|---|
committer | 2024-02-09 23:36:22 +0000 | |
commit | 1563c92b7816d288cad435282074c3a1997a8237 (patch) | |
tree | 9b8dc61d485c456a5a8bc33d57cc36c05e35de83 | |
parent | c1ec4628a98b0539a896bfdf6137101d5062d098 (diff) |
Inline osi/include/log.h
Bug: 279512287
Test: mmm packages/modules/Bluetooth
Flag: Exempt, mechanical refactor
Change-Id: I962860d1e39a0b1b32bfa2816c12a79b557b8a62
63 files changed, 78 insertions, 95 deletions
diff --git a/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h index e94cecfe2e..bc615790e5 100644 --- a/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h +++ b/system/audio_hal_interface/aidl/a2dp_encoding_aidl.h @@ -26,7 +26,7 @@ #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 "os/log.h" #include "osi/include/properties.h" #include "types/raw_address.h" diff --git a/system/audio_hal_interface/aidl/a2dp_provider_info.cc b/system/audio_hal_interface/aidl/a2dp_provider_info.cc index 4440085930..f7ecca871e 100644 --- a/system/audio_hal_interface/aidl/a2dp_provider_info.cc +++ b/system/audio_hal_interface/aidl/a2dp_provider_info.cc @@ -32,7 +32,7 @@ #include "a2dp_vendor_ldac_constants.h" #include "a2dp_vendor_opus_constants.h" #include "client_interface_aidl.h" -#include "osi/include/log.h" +#include "os/log.h" namespace bluetooth::audio::aidl::a2dp { diff --git a/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc index e8042707cb..e6fbd1622a 100644 --- a/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc +++ b/system/audio_hal_interface/aidl/hearing_aid_software_encoding_aidl.cc @@ -20,7 +20,7 @@ #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h" #include "client_interface_aidl.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" namespace { diff --git a/system/audio_hal_interface/aidl/le_audio_software_aidl.cc b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc index 08033e996c..87cf54734d 100644 --- a/system/audio_hal_interface/aidl/le_audio_software_aidl.cc +++ b/system/audio_hal_interface/aidl/le_audio_software_aidl.cc @@ -25,7 +25,7 @@ #include "codec_status_aidl.h" #include "hal_version_manager.h" -#include "osi/include/log.h" +#include "os/log.h" namespace bluetooth { namespace audio { diff --git a/system/audio_hal_interface/hfp_client_interface.cc b/system/audio_hal_interface/hfp_client_interface.cc index bd34d36c5d..5a42fa29fb 100644 --- a/system/audio_hal_interface/hfp_client_interface.cc +++ b/system/audio_hal_interface/hfp_client_interface.cc @@ -22,7 +22,7 @@ #include "aidl/hfp_client_interface_aidl.h" #include "hal_version_manager.h" #include "hfp_client_interface.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" using ::bluetooth::audio::aidl::hfp::HfpDecodingTransport; diff --git a/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc b/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc index 9599cc940d..48abb4a5b9 100644 --- a/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc +++ b/system/audio_hal_interface/hidl/hearing_aid_software_encoding_hidl.cc @@ -20,7 +20,7 @@ #include "audio_hearing_aid_hw/include/audio_hearing_aid_hw.h" #include "client_interface_hidl.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" namespace { diff --git a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc index d938c695dd..8bc4b6a3e0 100644 --- a/system/audio_hal_interface/hidl/le_audio_software_hidl.cc +++ b/system/audio_hal_interface/hidl/le_audio_software_hidl.cc @@ -19,7 +19,7 @@ #include "le_audio_software_hidl.h" -#include "osi/include/log.h" +#include "os/log.h" namespace bluetooth { namespace audio { diff --git a/system/audio_hal_interface/le_audio_software.cc b/system/audio_hal_interface/le_audio_software.cc index 35a85d4813..6a999e9878 100644 --- a/system/audio_hal_interface/le_audio_software.cc +++ b/system/audio_hal_interface/le_audio_software.cc @@ -28,7 +28,7 @@ #include "bta/le_audio/codec_manager.h" #include "hal_version_manager.h" #include "hidl/le_audio_software_hidl.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" namespace bluetooth { diff --git a/system/bta/av/bta_av_ci.cc b/system/bta/av/bta_av_ci.cc index bfa4574734..e598805ea0 100644 --- a/system/bta/av/bta_av_ci.cc +++ b/system/bta/av/bta_av_ci.cc @@ -26,8 +26,8 @@ #define LOG_TAG "bt_bta_av" #include "bta/av/bta_av_int.h" +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" #include "stack/include/bt_hdr.h" /******************************************************************************* diff --git a/system/bta/gatt/bta_gatts_queue.cc b/system/bta/gatt/bta_gatts_queue.cc index 33317c697f..a7911d880e 100644 --- a/system/bta/gatt/bta_gatts_queue.cc +++ b/system/bta/gatt/bta_gatts_queue.cc @@ -21,7 +21,7 @@ #include <unordered_set> #include "bta_gatt_server_queue.h" -#include "osi/include/log.h" +#include "os/log.h" using gatts_operation = BtaGattServerQueue::gatts_operation; using bluetooth::Uuid; diff --git a/system/bta/hd/bta_hd_api.cc b/system/bta/hd/bta_hd_api.cc index 52c0a0295b..cb89595886 100644 --- a/system/bta/hd/bta_hd_api.cc +++ b/system/bta/hd/bta_hd_api.cc @@ -30,9 +30,10 @@ #if defined(BTA_HD_INCLUDED) && (BTA_HD_INCLUDED == TRUE) #include "bta/hd/bta_hd_int.h" +#include "common/init_flags.h" +#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" -#include "osi/include/log.h" #include "stack/include/bt_hdr.h" #include "types/raw_address.h" diff --git a/system/bta/hearing_aid/hearing_aid_audio_source.cc b/system/bta/hearing_aid/hearing_aid_audio_source.cc index 7143dc8b5f..c0d85c9574 100644 --- a/system/bta/hearing_aid/hearing_aid_audio_source.cc +++ b/system/bta/hearing_aid/hearing_aid_audio_source.cc @@ -29,7 +29,7 @@ #include "bta/include/bta_hearing_aid_api.h" #include "common/repeating_timer.h" #include "common/time_util.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/wakelock.h" #include "stack/include/main_thread.h" #include "udrv/include/uipc.h" diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc index 969950a362..eefa473cda 100644 --- a/system/bta/hf_client/bta_hf_client_at.cc +++ b/system/bta/hf_client/bta_hf_client_at.cc @@ -21,9 +21,9 @@ #include "bta/hf_client/bta_hf_client_int.h" #include "internal_include/bt_trace.h" +#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" -#include "osi/include/log.h" #include "osi/include/properties.h" #include "stack/include/acl_api.h" #include "stack/include/port_api.h" diff --git a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc index f44218ebc0..ac51648803 100644 --- a/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc +++ b/system/bta/le_audio/audio_hal_client/audio_sink_hal_client.cc @@ -22,7 +22,7 @@ #include "audio_hal_interface/le_audio_software.h" #include "bta/le_audio/codec_manager.h" #include "common/time_util.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/wakelock.h" #include "stack/include/main_thread.h" diff --git a/system/bta/le_audio/broadcaster/state_machine.cc b/system/bta/le_audio/broadcaster/state_machine.cc index 64effcbeb4..8decd18b94 100644 --- a/system/bta/le_audio/broadcaster/state_machine.cc +++ b/system/bta/le_audio/broadcaster/state_machine.cc @@ -29,7 +29,7 @@ #include "bta/le_audio/le_audio_types.h" #include "common/strings.h" #include "hci/le_advertising_manager.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/btm_iso_api.h" diff --git a/system/bta/le_audio/codec_interface.cc b/system/bta/le_audio/codec_interface.cc index 5a0baf3d5a..b4ede54b8f 100644 --- a/system/bta/le_audio/codec_interface.cc +++ b/system/bta/le_audio/codec_interface.cc @@ -25,7 +25,7 @@ #include <optional> #include <vector> -#include "osi/include/log.h" +#include "os/log.h" namespace le_audio { diff --git a/system/bta/le_audio/codec_manager.cc b/system/bta/le_audio/codec_manager.cc index ecd18aa637..c01d34a0b8 100644 --- a/system/bta/le_audio/codec_manager.cc +++ b/system/bta/le_audio/codec_manager.cc @@ -21,7 +21,7 @@ #include "device/include/controller.h" #include "le_audio_set_configuration_provider.h" #include "le_audio_utils.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/hcimsgs.h" diff --git a/system/bta/le_audio/content_control_id_keeper.cc b/system/bta/le_audio/content_control_id_keeper.cc index 2ff0bad75c..75042b9881 100644 --- a/system/bta/le_audio/content_control_id_keeper.cc +++ b/system/bta/le_audio/content_control_id_keeper.cc @@ -23,7 +23,7 @@ #include "common/strings.h" #include "le_audio_types.h" -#include "osi/include/log.h" +#include "os/log.h" namespace { diff --git a/system/bta/le_audio/devices.h b/system/bta/le_audio/devices.h index 5738794826..db1626218e 100644 --- a/system/bta/le_audio/devices.h +++ b/system/bta/le_audio/devices.h @@ -37,8 +37,8 @@ #include "gatt_api.h" #include "le_audio_log_history.h" #include "le_audio_types.h" +#include "os/log.h" #include "osi/include/alarm.h" -#include "osi/include/log.h" #include "osi/include/properties.h" #include "raw_address.h" diff --git a/system/bta/le_audio/le_audio_client_test.cc b/system/bta/le_audio/le_audio_client_test.cc index 2af50d47da..90ba71f818 100644 --- a/system/bta/le_audio/le_audio_client_test.cc +++ b/system/bta/le_audio/le_audio_client_test.cc @@ -45,7 +45,7 @@ #include "mock_device_groups.h" #include "mock_iso_manager.h" #include "mock_state_machine.h" -#include "osi/include/log.h" +#include "os/log.h" #include "test/common/mock_functions.h" #define TEST_BT com::android::bluetooth::flags diff --git a/system/bta/le_audio/le_audio_health_status.cc b/system/bta/le_audio/le_audio_health_status.cc index 3de70b559b..5e548b0176 100644 --- a/system/bta/le_audio/le_audio_health_status.cc +++ b/system/bta/le_audio/le_audio_health_status.cc @@ -21,7 +21,7 @@ #include "bta/include/bta_groups.h" #include "common/strings.h" #include "main/shim/metrics_api.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" using bluetooth::common::ToString; diff --git a/system/bta/le_audio/le_audio_log_history.cc b/system/bta/le_audio/le_audio_log_history.cc index fae625f945..fe9dafdc96 100644 --- a/system/bta/le_audio/le_audio_log_history.cc +++ b/system/bta/le_audio/le_audio_log_history.cc @@ -26,7 +26,7 @@ #include "common/circular_buffer.h" #include "common/strings.h" #include "main/shim/dumpsys.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/osi.h" #include "osi/include/properties.h" diff --git a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc index d333820280..6d506c2df7 100644 --- a/system/bta/le_audio/le_audio_set_configuration_provider_json.cc +++ b/system/bta/le_audio/le_audio_set_configuration_provider_json.cc @@ -28,7 +28,7 @@ #include "flatbuffers/idl.h" #include "flatbuffers/util.h" #include "le_audio_set_configuration_provider.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/osi.h" #include "osi/include/properties.h" diff --git a/system/bta/le_audio/le_audio_utils.cc b/system/bta/le_audio/le_audio_utils.cc index d050681999..b44f1b1034 100644 --- a/system/bta/le_audio/le_audio_utils.cc +++ b/system/bta/le_audio/le_audio_utils.cc @@ -19,7 +19,7 @@ #include "bta/le_audio/content_control_id_keeper.h" #include "common/strings.h" #include "le_audio_types.h" -#include "osi/include/log.h" +#include "os/log.h" using bluetooth::common::ToString; using le_audio::types::AudioContexts; diff --git a/system/bta/le_audio/storage_helper.cc b/system/bta/le_audio/storage_helper.cc index 8214eab7f1..92b9cbca27 100644 --- a/system/bta/le_audio/storage_helper.cc +++ b/system/bta/le_audio/storage_helper.cc @@ -21,7 +21,7 @@ #include "client_parser.h" #include "common/strings.h" #include "le_audio_types.h" -#include "osi/include/log.h" +#include "os/log.h" #include "stack/include/bt_types.h" using le_audio::types::hdl_pair; diff --git a/system/bta/sys/bta_sys_conn.cc b/system/bta/sys/bta_sys_conn.cc index 2acbd0d62e..3c4759fcc3 100644 --- a/system/bta/sys/bta_sys_conn.cc +++ b/system/bta/sys/bta_sys_conn.cc @@ -28,7 +28,7 @@ #include "bta/sys/bta_sys_int.h" #include "internal_include/bt_target.h" #include "main/shim/dumpsys.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/btm_api.h" #include "types/hci_role.h" diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc index 50c2f8a9bb..5882416d20 100644 --- a/system/bta/sys/bta_sys_main.cc +++ b/system/bta/sys/bta_sys_main.cc @@ -33,9 +33,9 @@ #include "bta/sys/bta_sys_int.h" #include "include/hardware/bluetooth.h" #include "internal_include/bt_target.h" +#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" #include "stack/include/bt_hdr.h" #include "stack/include/main_thread.h" diff --git a/system/btcore/src/osi_module.cc b/system/btcore/src/osi_module.cc index 9481c87bab..6a9f939f18 100644 --- a/system/btcore/src/osi_module.cc +++ b/system/btcore/src/osi_module.cc @@ -19,10 +19,11 @@ #define LOG_TAG "bt_osi_module" #include "btcore/include/osi_module.h" + #include "btcore/include/module.h" +#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/future.h" -#include "osi/include/log.h" #include "osi/include/osi.h" #include "osi/include/wakelock.h" diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h index c4a55b3356..b10b84581b 100644 --- a/system/btif/include/btif_common.h +++ b/system/btif/include/btif_common.h @@ -29,7 +29,7 @@ #include "abstract_message_loop.h" #include "bta/include/bta_api.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/osi.h" #include "stack/include/bt_hdr.h" #include "types/raw_address.h" diff --git a/system/btif/src/btif_a2dp.cc b/system/btif/src/btif_a2dp.cc index 4308d63843..0e6f217e49 100644 --- a/system/btif/src/btif_a2dp.cc +++ b/system/btif/src/btif_a2dp.cc @@ -35,7 +35,7 @@ #include "btif_hf.h" #include "btif_util.h" #include "internal_include/bt_trace.h" -#include "osi/include/log.h" +#include "os/log.h" #include "types/raw_address.h" void btif_a2dp_on_idle(const RawAddress& peer_addr) { diff --git a/system/btif/src/btif_bqr.cc b/system/btif/src/btif_bqr.cc index b8a5fabf74..5ee7a9d44b 100644 --- a/system/btif/src/btif_bqr.cc +++ b/system/btif/src/btif_bqr.cc @@ -30,6 +30,7 @@ #include "btif_storage.h" #include "btm_api.h" #include "btm_ble_api.h" +#include "common/init_flags.h" #include "common/leaky_bonded_queue.h" #include "common/time_util.h" #include "core_callbacks.h" diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index 427760564a..960d8cb2f9 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -63,6 +63,7 @@ #include "btif_profile_storage.h" #include "btif_storage.h" #include "btif_util.h" +#include "common/init_flags.h" #include "common/lru_cache.h" #include "common/metrics.h" #include "device/include/controller.h" diff --git a/system/btif/src/btif_sdp_server.cc b/system/btif/src/btif_sdp_server.cc index e861aeb595..75653a7b2a 100644 --- a/system/btif/src/btif_sdp_server.cc +++ b/system/btif/src/btif_sdp_server.cc @@ -40,6 +40,7 @@ #include "bta/sys/bta_sys.h" #include "btif_common.h" #include "btif_sock_sdp.h" +#include "common/init_flags.h" #include "osi/include/allocator.h" #include "stack/include/bt_types.h" #include "stack/include/bt_uuid16.h" diff --git a/system/btif/src/btif_storage.cc b/system/btif/src/btif_storage.cc index 8e7b42323a..8cfc4e8177 100644 --- a/system/btif/src/btif_storage.cc +++ b/system/btif/src/btif_storage.cc @@ -46,6 +46,7 @@ #include "btif_config.h" #include "btif_storage.h" #include "btif_util.h" +#include "common/init_flags.h" #include "core_callbacks.h" #include "device/include/controller.h" #include "internal_include/bt_target.h" diff --git a/system/common/base_bind_unittest.cc b/system/common/base_bind_unittest.cc index a5dc1574c0..7c77f97f91 100644 --- a/system/common/base_bind_unittest.cc +++ b/system/common/base_bind_unittest.cc @@ -24,7 +24,7 @@ #include <memory> #include <mutex> -#include "osi/include/log.h" +#include "os/log.h" class BaseBindThreadTest : public ::testing::Test { public: diff --git a/system/common/stop_watch_legacy.cc b/system/common/stop_watch_legacy.cc index f7d8ba9598..6b783cba03 100644 --- a/system/common/stop_watch_legacy.cc +++ b/system/common/stop_watch_legacy.cc @@ -18,13 +18,15 @@ #include "common/stop_watch_legacy.h" +#include <base/logging.h> + #include <iomanip> #include <mutex> #include <sstream> #include <utility> -#include <base/logging.h> -#include "osi/include/log.h" +#include "common/init_flags.h" +#include "os/log.h" namespace bluetooth { namespace common { diff --git a/system/device/src/interop.cc b/system/device/src/interop.cc index 833587fb55..6058a481f8 100644 --- a/system/device/src/interop.cc +++ b/system/device/src/interop.cc @@ -42,11 +42,11 @@ #include "check.h" #include "device/include/interop_config.h" #include "device/include/interop_database.h" +#include "os/log.h" #include "osi/include/allocator.h" #include "osi/include/compat.h" #include "osi/include/config.h" #include "osi/include/list.h" -#include "osi/include/log.h" #include "osi/include/osi.h" #include "types/raw_address.h" diff --git a/system/main/bte_init_cpp_logging.cc b/system/main/bte_init_cpp_logging.cc index 520d14db84..367cce1fb9 100644 --- a/system/main/bte_init_cpp_logging.cc +++ b/system/main/bte_init_cpp_logging.cc @@ -18,7 +18,7 @@ #include <base/command_line.h> #include <base/logging.h> #include <base/strings/stringprintf.h> -#include <osi/include/log.h> +#include <os/log.h> #include "main_int.h" diff --git a/system/main/stack_config.cc b/system/main/stack_config.cc index 8b0496070f..4f0e86c6c5 100644 --- a/system/main/stack_config.cc +++ b/system/main/stack_config.cc @@ -23,8 +23,8 @@ #include <base/logging.h> #include "include/check.h" +#include "os/log.h" #include "osi/include/future.h" -#include "osi/include/log.h" namespace { const char* PTS_AVRCP_TEST = "PTS_AvrcpTest"; diff --git a/system/osi/include/log.h b/system/osi/include/log.h deleted file mode 100644 index e2fe11f82b..0000000000 --- a/system/osi/include/log.h +++ /dev/null @@ -1,29 +0,0 @@ -/****************************************************************************** - * - * Copyright 2014 Google, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ - -#pragma once - -#include "common/init_flags.h" - -#ifndef OSI_INCLUDE_LOG_H -#define OSI_INCLUDE_LOG_H -#endif - -#include "os/log.h" - -#undef OSI_INCLUDE_LOG_H
\ No newline at end of file diff --git a/system/osi/src/future.cc b/system/osi/src/future.cc index fe97b9c393..ece49c7a05 100644 --- a/system/osi/src/future.cc +++ b/system/osi/src/future.cc @@ -23,8 +23,8 @@ #include <base/logging.h> #include "check.h" +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" #include "osi/include/osi.h" #include "osi/semaphore.h" diff --git a/system/rust/src/core/ffi/module.cc b/system/rust/src/core/ffi/module.cc index b2c77c433a..ace30e9289 100644 --- a/system/rust/src/core/ffi/module.cc +++ b/system/rust/src/core/ffi/module.cc @@ -19,7 +19,7 @@ #include <hardware/bt_gatt.h> #include "btcore/include/module.h" -#include "osi/include/log.h" +#include "os/log.h" #ifndef TARGET_FLOSS #include "src/connection/ffi/connection_shim.h" #include "src/core/ffi.rs.h" diff --git a/system/stack/a2dp/a2dp_vendor_opus_decoder.cc b/system/stack/a2dp/a2dp_vendor_opus_decoder.cc index 986b5b4dbe..ad3fbe1443 100644 --- a/system/stack/a2dp/a2dp_vendor_opus_decoder.cc +++ b/system/stack/a2dp/a2dp_vendor_opus_decoder.cc @@ -23,8 +23,8 @@ #include <opus.h> #include "a2dp_vendor_opus.h" +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" using namespace bluetooth; diff --git a/system/stack/btm/btm_sco_hfp_hal_linux.cc b/system/stack/btm/btm_sco_hfp_hal_linux.cc index 15e4d44554..437c97c437 100644 --- a/system/stack/btm/btm_sco_hfp_hal_linux.cc +++ b/system/stack/btm/btm_sco_hfp_hal_linux.cc @@ -24,7 +24,7 @@ #include "common/init_flags.h" #include "hci/controller_interface.h" #include "main/shim/entry.h" -#include "osi/include/log.h" +#include "os/log.h" #include "osi/include/properties.h" #include "stack/include/hcimsgs.h" #include "stack/include/sdpdefs.h" diff --git a/system/stack/btm/hfp_lc3_decoder.cc b/system/stack/btm/hfp_lc3_decoder.cc index dd82859694..3899acb297 100644 --- a/system/stack/btm/hfp_lc3_decoder.cc +++ b/system/stack/btm/hfp_lc3_decoder.cc @@ -23,8 +23,8 @@ #include <cstring> +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" const int HFP_LC3_H2_HEADER_LEN = 2; const int HFP_LC3_PKT_FRAME_LEN = 58; diff --git a/system/stack/btm/hfp_lc3_decoder_linux.cc b/system/stack/btm/hfp_lc3_decoder_linux.cc index 52d3d4513f..3bda1aacb1 100644 --- a/system/stack/btm/hfp_lc3_decoder_linux.cc +++ b/system/stack/btm/hfp_lc3_decoder_linux.cc @@ -21,7 +21,7 @@ #include "hfp_lc3_decoder.h" #include "mmc/codec_client/codec_client.h" #include "mmc/proto/mmc_config.pb.h" -#include "osi/include/log.h" +#include "os/log.h" const int HFP_LC3_H2_HEADER_LEN = 2; const int HFP_LC3_PKT_FRAME_LEN = 58; diff --git a/system/stack/btm/hfp_lc3_encoder.cc b/system/stack/btm/hfp_lc3_encoder.cc index f968513282..3924188725 100644 --- a/system/stack/btm/hfp_lc3_encoder.cc +++ b/system/stack/btm/hfp_lc3_encoder.cc @@ -22,8 +22,8 @@ #include <cstring> +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" const int HFP_LC3_PCM_BYTES = 480; const int HFP_LC3_PKT_FRAME_LEN = 58; diff --git a/system/stack/btm/hfp_lc3_encoder_linux.cc b/system/stack/btm/hfp_lc3_encoder_linux.cc index 7225014776..57a42299d4 100644 --- a/system/stack/btm/hfp_lc3_encoder_linux.cc +++ b/system/stack/btm/hfp_lc3_encoder_linux.cc @@ -19,7 +19,7 @@ #include "hfp_lc3_encoder.h" #include "mmc/codec_client/codec_client.h" #include "mmc/proto/mmc_config.pb.h" -#include "osi/include/log.h" +#include "os/log.h" const int HFP_LC3_PCM_BYTES = 480; const int HFP_LC3_PKT_FRAME_LEN = 58; diff --git a/system/stack/btm/hfp_msbc_decoder.cc b/system/stack/btm/hfp_msbc_decoder.cc index 96c882528d..e6ac0628a1 100644 --- a/system/stack/btm/hfp_msbc_decoder.cc +++ b/system/stack/btm/hfp_msbc_decoder.cc @@ -24,7 +24,7 @@ #include "embdrv/sbc/decoder/include/oi_codec_sbc.h" #include "embdrv/sbc/decoder/include/oi_status.h" -#include "osi/include/log.h" +#include "os/log.h" #define HFP_MSBC_PKT_LEN 60 #define HFP_MSBC_PCM_BYTES 240 diff --git a/system/stack/btm/hfp_msbc_encoder.cc b/system/stack/btm/hfp_msbc_encoder.cc index 581a49d156..f5934d57e3 100644 --- a/system/stack/btm/hfp_msbc_encoder.cc +++ b/system/stack/btm/hfp_msbc_encoder.cc @@ -21,7 +21,7 @@ #include <cstring> #include "embdrv/sbc/encoder/include/sbc_encoder.h" -#include "osi/include/log.h" +#include "os/log.h" typedef struct { SBC_ENC_PARAMS sbc_encoder_params; diff --git a/system/stack/pan/pan_main.cc b/system/stack/pan/pan_main.cc index b06e51b723..284ac54b25 100644 --- a/system/stack/pan/pan_main.cc +++ b/system/stack/pan/pan_main.cc @@ -30,8 +30,8 @@ #include <cstdint> +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" #include "osi/include/osi.h" // UNUSED_ATTR #include "stack/include/bnep_api.h" #include "stack/include/bt_hdr.h" diff --git a/system/test/common/jni_thread.cc b/system/test/common/jni_thread.cc index 8216671445..720e6ddc21 100644 --- a/system/test/common/jni_thread.cc +++ b/system/test/common/jni_thread.cc @@ -20,7 +20,7 @@ #include <map> -#include "osi/include/log.h" +#include "os/log.h" std::queue<base::OnceClosure> do_in_jni_thread_task_queue; diff --git a/system/test/common/main_handler.cc b/system/test/common/main_handler.cc index fa1b853c83..a1c2f1a9ba 100644 --- a/system/test/common/main_handler.cc +++ b/system/test/common/main_handler.cc @@ -25,7 +25,7 @@ #include "common/message_loop_thread.h" #include "include/hardware/bluetooth.h" -#include "osi/include/log.h" +#include "os/log.h" using bluetooth::common::MessageLoopThread; using BtMainClosure = std::function<void()>; diff --git a/system/test/common/mock_functions.cc b/system/test/common/mock_functions.cc index 776cf1d4a4..638d5b32fd 100644 --- a/system/test/common/mock_functions.cc +++ b/system/test/common/mock_functions.cc @@ -18,7 +18,7 @@ #include <map> -#include "osi/include/log.h" +#include "os/log.h" static std::map<std::string, int>& _get_func_call_count_map() { static std::map<std::string, int> mock_function_count_map; diff --git a/system/test/fake/fake_looper.cc b/system/test/fake/fake_looper.cc index 582fe124b1..a9ea6064c4 100644 --- a/system/test/fake/fake_looper.cc +++ b/system/test/fake/fake_looper.cc @@ -26,8 +26,8 @@ #include <mutex> #include <queue> +#include "os/log.h" #include "osi/include/allocator.h" -#include "osi/include/log.h" #include "test/fake/fake_thread.h" pid_t get_thread_id() { diff --git a/system/test/headless/discovery/discovery.cc b/system/test/headless/discovery/discovery.cc index 5e18b64a24..a9742673d7 100644 --- a/system/test/headless/discovery/discovery.cc +++ b/system/test/headless/discovery/discovery.cc @@ -22,7 +22,7 @@ #include "base/logging.h" // LOG() stdout and android log #include "btif/include/btif_api.h" -#include "osi/include/log.h" // android log only +#include "os/log.h" // android log only #include "stack/include/sdp_api.h" #include "test/headless/bt_property.h" #include "test/headless/get_options.h" diff --git a/system/test/headless/dumpsys/dumpsys.cc b/system/test/headless/dumpsys/dumpsys.cc index 33737ecb64..0de639ce43 100644 --- a/system/test/headless/dumpsys/dumpsys.cc +++ b/system/test/headless/dumpsys/dumpsys.cc @@ -16,14 +16,15 @@ #define LOG_TAG "bt_headless_sdp" +#include "test/headless/dumpsys/dumpsys.h" + #include <future> -#include "base/logging.h" // LOG() stdout and android log -#include "osi/include/log.h" // android log only +#include "base/logging.h" // LOG() stdout and android log +#include "os/log.h" // android log only #include "stack/include/btm_api.h" #include "stack/include/btm_api_types.h" #include "stack/include/hci_error_code.h" -#include "test/headless/dumpsys/dumpsys.h" #include "test/headless/get_options.h" #include "test/headless/headless.h" #include "types/raw_address.h" diff --git a/system/test/headless/log.cc b/system/test/headless/log.cc index f192e0dbd6..6105a9afcf 100644 --- a/system/test/headless/log.cc +++ b/system/test/headless/log.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "osi/include/log.h" +#include "os/log.h" #include <chrono> #include <ctime> diff --git a/system/test/headless/main.cc b/system/test/headless/main.cc index d54ed840f5..e40bf85234 100644 --- a/system/test/headless/main.cc +++ b/system/test/headless/main.cc @@ -26,7 +26,7 @@ #include <unordered_map> #include "base/logging.h" // LOG() stdout and android log -#include "osi/include/log.h" // android log only +#include "os/log.h" // android log only #include "test/headless/adapter/adapter.h" #include "test/headless/connect/connect.h" #include "test/headless/discovery/discovery.h" diff --git a/system/test/headless/nop/nop.cc b/system/test/headless/nop/nop.cc index f6ac42c45a..9b194ba5e9 100644 --- a/system/test/headless/nop/nop.cc +++ b/system/test/headless/nop/nop.cc @@ -16,14 +16,15 @@ #define LOG_TAG "bt_headless_sdp" +#include "test/headless/nop/nop.h" + #include <future> -#include "base/logging.h" // LOG() stdout and android log -#include "osi/include/log.h" // android log only +#include "base/logging.h" // LOG() stdout and android log +#include "os/log.h" // android log only #include "stack/include/sdp_api.h" #include "test/headless/get_options.h" #include "test/headless/headless.h" -#include "test/headless/nop/nop.h" #include "types/raw_address.h" int bluetooth::test::headless::Nop::Run() { diff --git a/system/test/headless/read/name.cc b/system/test/headless/read/name.cc index 5666d88a0b..f7f49bec2e 100644 --- a/system/test/headless/read/name.cc +++ b/system/test/headless/read/name.cc @@ -16,15 +16,16 @@ #define LOG_TAG "bt_headless_sdp" +#include "test/headless/read/name.h" + #include <future> -#include "base/logging.h" // LOG() stdout and android log -#include "osi/include/log.h" // android log only +#include "base/logging.h" // LOG() stdout and android log +#include "os/log.h" // android log only #include "stack/include/btm_api.h" #include "stack/include/btm_api_types.h" #include "test/headless/get_options.h" #include "test/headless/headless.h" -#include "test/headless/read/name.h" #include "types/raw_address.h" std::promise<tBTM_REMOTE_DEV_NAME> promise_; diff --git a/system/test/headless/read/read.cc b/system/test/headless/read/read.cc index d1a3b8d295..f01f8aa3b2 100644 --- a/system/test/headless/read/read.cc +++ b/system/test/headless/read/read.cc @@ -17,8 +17,9 @@ #define LOG_TAG "bt_headless" #include "test/headless/read/read.h" -#include "base/logging.h" // LOG() stdout and android log -#include "osi/include/log.h" // android log only + +#include "base/logging.h" // LOG() stdout and android log +#include "os/log.h" // android log only #include "test/headless/get_options.h" #include "test/headless/headless.h" #include "test/headless/read/name.h" diff --git a/system/test/stub/osi.cc b/system/test/stub/osi.cc index 6643ad7b5c..0af9fc30ad 100644 --- a/system/test/stub/osi.cc +++ b/system/test/stub/osi.cc @@ -26,6 +26,7 @@ #include <map> #include <string> +#include "os/log.h" #include "osi/include/alarm.h" #include "osi/include/allocator.h" #include "osi/include/config.h" @@ -33,7 +34,6 @@ #include "osi/include/future.h" #include "osi/include/hash_map_utils.h" #include "osi/include/list.h" -#include "osi/include/log.h" #include "osi/include/reactor.h" #include "osi/include/ringbuffer.h" #include "osi/include/socket.h" |