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

Commit c0949495 authored May 18, 2022 by Colin Cross

Fix musl build for bluetooth

Turning on code coverage directly with cflags and ldflags is not
supported, it generally takes more work from the build system to
provide the right runtime.  It happens to work for glibc, where
clang can guess the right runtime itself, but when building against
musl clang picks the wrong runtime causing link errors:

ld.lld: error: undefined symbol: __strdup
>>> referenced by InstrProfilingFile.c
>>>               InstrProfilingFile.c.o:(parseAndSetFilename) in archive /usr/local/google/home/ccross/ssd/aosp/prebuilts/clang/host/linux-x86/clang-r450784e/lib64/clang/14.0.7/lib/linux/libclang_rt.profile-x86_64.a

Move the flags to only be used with glibc.

Also include sys/cdefs.h for __BEGIN_DECLS and __END_DECLS.

Bug: 190084016
Test: m USE_HOST_MUSL=true
Change-Id: I1eef4aee5c7b691c0638cc1b00ce4b4661397974

parent b3106508

system/build/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -146,7 +146,7 @@ fluoride_defaults {
		cc_defaults {
		name: "clang_file_coverage",
		target: {
		host: {
		glibc: {
		clang_cflags: [
		"-fprofile-instr-generate",
		"-fcoverage-mapping",
		@@ -164,7 +164,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>