From 90a8b3abd5116b6f671127ef290e67cd92275102 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 2 Aug 2021 13:17:13 -0700 Subject: [PATCH] Remove libjemalloc5 from default musl libraries The musl allocator works now, remove libjemalloc5 from the default libraries. Bug: 190084016 Test: prebuilts/build-tools/build-prebuilts.sh --musl Change-Id: I12ef8112af99f90e10e8a247ddc2eddfd4cd98a0 --- cc/config/x86_linux_host.go | 2 +- cc/testing.go | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cc/config/x86_linux_host.go b/cc/config/x86_linux_host.go index 1d66cb713..e7fcfed42 100644 --- a/cc/config/x86_linux_host.go +++ b/cc/config/x86_linux_host.go @@ -110,7 +110,7 @@ var ( 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"} - muslDefaultSharedLibraries = []string{"libjemalloc5", "libc_musl"} + muslDefaultSharedLibraries = []string{"libc_musl"} ) const ( diff --git a/cc/testing.go b/cc/testing.go index e8f348115..071f1ec3b 100644 --- a/cc/testing.go +++ b/cc/testing.go @@ -451,16 +451,6 @@ func commonDefaultModules() string { name: "note_memtag_heap_sync", } - - cc_library { - name: "libjemalloc5", - host_supported: true, - no_libcrt: true, - nocrt: true, - system_shared_libs: [], - stl: "none", - } - cc_library { name: "libc_musl", host_supported: true,