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

Commit b263a50f authored Sep 15, 2021 by Colin Cross Committed by Automerger Merge Worker Sep 15, 2021

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

Merge "Fix system/bt compiling against musl" am: 120554b1 am: 0839d1ea am: 9991e233 am: 1e31e3a0

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

Change-Id: I259aa1132af773a66e953e35cd2dfd0379e3f17a

parents 76940e16 1e31e3a0

system/btcore/src/device_class.cc

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@

	#include <arpa/inet.h>		#include <arpa/inet.h>
	#include <base/logging.h>		#include <base/logging.h>
			#include <endian.h>
	#include <string.h>		#include <string.h>

	#include "btcore/include/device_class.h"		#include "btcore/include/device_class.h"

system/btif/co/bta_hh_co.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,11 +21,11 @@
	#include <errno.h>		#include <errno.h>
	#include <fcntl.h>		#include <fcntl.h>
	#include <linux/uhid.h>		#include <linux/uhid.h>
			#include <poll.h>
	#include <pthread.h>		#include <pthread.h>
	#include <stdint.h>		#include <stdint.h>
	#include <stdio.h>		#include <stdio.h>
	#include <string.h>		#include <string.h>
	#include <sys/poll.h>
	#include <unistd.h>		#include <unistd.h>

	#include "bta_api.h"		#include "bta_api.h"

system/btif/src/btif_pan.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,8 +34,8 @@
	#include <linux/if_ether.h>		#include <linux/if_ether.h>
	#include <linux/if_tun.h>		#include <linux/if_tun.h>
	#include <net/if.h>		#include <net/if.h>
			#include <poll.h>
	#include <sys/ioctl.h>		#include <sys/ioctl.h>
	#include <sys/poll.h>
	#include <unistd.h>		#include <unistd.h>

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

system/btif/src/btif_sock_thread.cc

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,12 +33,12 @@
	#include <errno.h>		#include <errno.h>
	#include <fcntl.h>		#include <fcntl.h>
	#include <features.h>		#include <features.h>
			#include <poll.h>
	#include <pthread.h>		#include <pthread.h>
	#include <signal.h>		#include <signal.h>
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>
	#include <string.h>		#include <string.h>
	#include <sys/poll.h>
	#include <sys/select.h>		#include <sys/select.h>
	#include <sys/socket.h>		#include <sys/socket.h>
	#include <sys/types.h>		#include <sys/types.h>

system/gd/os/linux_generic/reactive_semaphore.cc

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	#include "reactive_semaphore.h"		#include "reactive_semaphore.h"

	#include <error.h>
	#include <string.h>		#include <string.h>
	#include <sys/eventfd.h>		#include <sys/eventfd.h>
	#include <unistd.h>		#include <unistd.h>