[compiler-rt] [scudo] Remove hard-coded use of AndroidConfig. (PR #66845)

[Christopher Ferris via llvm-commits]

https://github.com/cferris1000 created https://github.com/llvm/llvm-project/pull/66845

The bionic wrappers hard-coded use of AndroidConfig. This overrides the custom config code, so remove the hard-coding.

>From cbe7a34edd9d6baec1182f8bc9f61a4d1f6c5630 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris at google.com>
Date: Tue, 19 Sep 2023 18:28:47 -0700
Subject: [PATCH] [scudo] Remove hard-coded use of AndroidConfig.

The bionic wrappers hard-coded use of AndroidConfig. This overrides
the custom config code, so remove the hard-coding.
---
 compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
index 4e8e37ac293b86a..4fed44779b9020d 100644
--- a/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
+++ b/compiler-rt/lib/scudo/standalone/wrappers_c_bionic.cpp
@@ -27,7 +27,7 @@
 
 extern "C" void SCUDO_PREFIX(malloc_postinit)();
 SCUDO_REQUIRE_CONSTANT_INITIALIZATION
-static scudo::Allocator<scudo::AndroidConfig, SCUDO_PREFIX(malloc_postinit)>
+static scudo::Allocator<scudo::Config, SCUDO_PREFIX(malloc_postinit)>
     SCUDO_ALLOCATOR;
 
 #include "wrappers_c.inc"