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

Commit 59336bbe authored May 24, 2022 by Colin Cross Committed by Automerger Merge Worker May 24, 2022

Merge "Fix musl build for bluetooth" am: 4fa9f620 am: 9facb5ba am: 2f1348c3 am: 7287b161

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2104004

Change-Id: I9bd687b5567e18f53f291eb696761b1f0b052f19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents aa219c9d 7287b161

system/build/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ fluoride_defaults {
		cc_defaults {
		name: "clang_file_coverage",
		target: {
		host: {
		glibc: {
		clang_cflags: [
		"-fprofile-instr-generate",
		"-fcoverage-mapping",
		@@ -346,7 +346,7 @@ cc_defaults {
		cc_defaults {
		name: "clang_coverage_bin",
		target: {
		host: {
		glibc: {
		ldflags: [
		"-fprofile-instr-generate",
		"-fcoverage-mapping",

system/gd/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ cc_defaults {
		cc_defaults {
		name: "gd_clang_file_coverage",
		target: {
		host: {
		glibc: {
		clang_cflags: [
		"-fprofile-instr-generate",
		"-fcoverage-mapping",
		@@ -76,7 +76,7 @@ cc_defaults {
		cc_defaults {
		name: "gd_clang_coverage_bin",
		target: {
		host: {
		glibc: {
		ldflags: [
		"-fprofile-instr-generate",
		"-fcoverage-mapping",

system/include/hardware/bt_gatt_types.h

+1 −0

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

		#include <stdbool.h>
		#include <stdint.h>
		#include <sys/cdefs.h>

		#include <bluetooth/uuid.h>