From 21e2c10cd2e326cff0e3ea38f6d313f82f49a233 Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Wed, 28 Feb 2024 18:59:30 -0800 Subject: [PATCH] disablePrebuilt: also clear sanitizer-dependent Srcs The new libc++ prebuilt has HWASan and non-HWASan variants for arm64. Bug: 175635923 Test: checkout use-prebuilt-libcxx topic, build libc++demangle, verify that libc++demangle-install is not a valid build target Change-Id: I34385c48aa7ad1401e2547d65d30a14fa342e304 --- cc/prebuilt.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cc/prebuilt.go b/cc/prebuilt.go index 8f4b7df42..cbb5d58db 100644 --- a/cc/prebuilt.go +++ b/cc/prebuilt.go @@ -260,6 +260,9 @@ func (p *prebuiltLibraryLinker) nativeCoverage() bool { func (p *prebuiltLibraryLinker) disablePrebuilt() { p.properties.Srcs = nil + p.properties.Sanitized.None.Srcs = nil + p.properties.Sanitized.Address.Srcs = nil + p.properties.Sanitized.Hwaddress.Srcs = nil } // Implements versionedInterface