From d87145fe0560f8a5f6a1b5d0e90c8dde30ee66cb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 19 May 2016 22:43:46 -0700 Subject: [PATCH] Add libclang_rt.asan-mips[64]-android.so Add the clang asan runtime libraries to the mips and mips64 toolchain definitions. Fixes missing symbol build errors on asan_test. Change-Id: I10c46599af2c7758f4726814920b8881644c6f97 --- cc/mips64_device.go | 4 ++++ cc/mips_device.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cc/mips64_device.go b/cc/mips64_device.go index 7cab09bce..04e31a957 100644 --- a/cc/mips64_device.go +++ b/cc/mips64_device.go @@ -186,6 +186,10 @@ func (t *toolchainMips64) ClangLdflags() string { return "${mips64ClangLdflags}" } +func (toolchainMips64) AddressSanitizerRuntimeLibrary() string { + return "libclang_rt.asan-mips64-android.so" +} + func mips64ToolchainFactory(arch android.Arch) Toolchain { return &toolchainMips64{ cflags: "${mips64Cflags}", diff --git a/cc/mips_device.go b/cc/mips_device.go index b2b2ccfeb..0dbbbd7b0 100644 --- a/cc/mips_device.go +++ b/cc/mips_device.go @@ -234,6 +234,10 @@ func (t *toolchainMips) ClangLdflags() string { return "${mipsClangLdflags}" } +func (toolchainMips) AddressSanitizerRuntimeLibrary() string { + return "libclang_rt.asan-mips-android.so" +} + func mipsToolchainFactory(arch android.Arch) Toolchain { return &toolchainMips{ cflags: "${mipsCflags}",