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

Commit 0645c96b authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Gerrit Code Review
Browse files

Merge changes from topic "libchrome-r1093705" 

* changes:
  Update {bind,callback,callback_forward,callback_helpers}.h includes
  floss: Uprev libchrome package to 1094370
  floss: Uprev modp_b64 package to R110
parents a93c1faa 4a65e27d

android/app/jni/com_android_bluetooth_avrcp_target.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#define LOG_TAG "AvrcpTargetJni"



#include <base/bind.h>

#include <base/callback.h>

#include <base/functional/bind.h>

#include <base/functional/callback.h>

#include <map>

#include <mutex>

#include <shared_mutex>

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#define LOG_TAG "BtGatt.JNI"



#include <base/bind.h>

#include <base/callback.h>

#include <base/functional/bind.h>

#include <base/functional/callback.h>

#include <cutils/log.h>

#include <string.h>

system/bta/ag/bta_ag_api.cc

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


#include "bta/include/bta_ag_api.h"



#include <base/bind.h>

#include <base/functional/bind.h>

#include <base/location.h>



#include <cstdint>

system/bta/ag/bta_ag_rfc.cc

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
 *

 ******************************************************************************/



#include <base/bind.h>

#include <base/functional/bind.h>

#include <base/logging.h>



#include <cstring>

system/bta/ag/bta_ag_sco.cc

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

 ******************************************************************************/



#include <base/bind.h>

#include <base/functional/bind.h>

#include <base/logging.h>



#include <cstdint>