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

Commit 0839d1ea authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Fix system/bt compiling against musl" am: 120554b1 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1826276

Change-Id: I5935d32fb15a8d9114b7dc9e625b688455fb655a
parents 4f75f68d 120554b1

system/btcore/src/device_class.cc

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <arpa/inet.h>

#include <base/logging.h>

#include <endian.h>

#include <string.h>



#include "btcore/include/device_class.h"

system/btif/co/bta_hh_co.cc

+1 −1
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include <errno.h>

#include <fcntl.h>

#include <linux/uhid.h>

#include <poll.h>

#include <pthread.h>

#include <stdint.h>

#include <stdio.h>

#include <string.h>

#include <sys/poll.h>

#include <unistd.h>



#include "bta_api.h"

system/btif/src/btif_pan.cc

+1 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
#include <linux/if_ether.h>

#include <linux/if_tun.h>

#include <net/if.h>

#include <poll.h>

#include <sys/ioctl.h>

#include <sys/poll.h>

#include <unistd.h>



#include "bt_target.h"  // Must be first to define build configuration

system/btif/src/btif_sock_thread.cc

+1 −1
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ 
#include <errno.h>

#include <fcntl.h>

#include <features.h>

#include <poll.h>

#include <pthread.h>

#include <signal.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/poll.h>

#include <sys/select.h>

#include <sys/socket.h>

#include <sys/types.h>

system/gd/os/linux_generic/reactive_semaphore.cc

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#include "reactive_semaphore.h"



#include <error.h>

#include <string.h>

#include <sys/eventfd.h>

#include <unistd.h>