StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove libjemalloc5 from default musl libraries" am: 88c5391dbe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1784829

Change-Id: I0840de20a17ce298d18c79ce05ed0136391be5ab
This commit is contained in:
Colin Cross
2021-08-11 14:29:19 +00:00
committed by Automerger Merge Worker
parent 36de51a1d3 88c5391dbe
commit 35cff6ebd9
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/config/x86_linux_host.go
View File

@@ -110,7 +110,7 @@ var (
muslCrtBeginSharedBinary, muslCrtEndSharedBinary = []string{"libc_musl_crtbegin_dynamic", "musl_linker_script"}, []string{"libc_musl_crtend"} muslCrtBeginSharedBinary, muslCrtEndSharedBinary = []string{"libc_musl_crtbegin_dynamic", "musl_linker_script"}, []string{"libc_musl_crtend"}
muslCrtBeginSharedLibrary, muslCrtEndSharedLibrary = []string{"libc_musl_crtbegin_so"}, []string{"libc_musl_crtend_so"} muslCrtBeginSharedLibrary, muslCrtEndSharedLibrary = []string{"libc_musl_crtbegin_so"}, []string{"libc_musl_crtend_so"}
muslDefaultSharedLibraries = []string{"libjemalloc5", "libc_musl"} muslDefaultSharedLibraries = []string{"libc_musl"}
) )
const ( const (

10
cc/testing.go
View File

@@ -451,16 +451,6 @@ func commonDefaultModules() string {
name: "note_memtag_heap_sync", name: "note_memtag_heap_sync",
} }
cc_library {
name: "libjemalloc5",
host_supported: true,
no_libcrt: true,
nocrt: true,
system_shared_libs: [],
stl: "none",
}
cc_library { cc_library {
name: "libc_musl", name: "libc_musl",
host_supported: true, host_supported: true,