Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb4a2ada authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes Ib1741d8a,I150fe1da,Ibc58a0e8,I4adde102,I08cd2cf8 into main 

* changes:
  Remove gd/ from message_loop_thread.h
  Remove gd/ from includes in the fuzzers
  Remove gd prefix from include files
  Add btif/include when including from outside btif
  Remove gd from init_flags.h path
parents d12a951f 295bb332

android/app/jni/com_android_bluetooth_BluetoothQualityReport.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include "base/logging.h"

#include "com_android_bluetooth.h"

#include "gd/common/init_flags.h"

#include "common/init_flags.h"

#include "hardware/bt_bqr.h"



using bluetooth::bqr::BluetoothQualityReportCallbacks;

android/app/jni/com_android_bluetooth_gatt.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <shared_mutex>



#include "com_android_bluetooth.h"

#include "gd/common/init_flags.h"

#include "common/init_flags.h"

#include "hardware/bt_gatt.h"

#include "hardware/bt_gatt_types.h"

#include "rust/cxx.h"

system/audio_hal_interface/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -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",

    ],

system/audio_hal_interface/a2dp_encoding_host.cc

+3 −3
Original line number Diff line number Diff line
@@ -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"

system/audio_hal_interface/aidl/a2dp_encoding_aidl.h

+4 −4
Original line number Diff line number Diff line
@@ -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"