commit b5b2aba43b5bb6305ea69d60f9bf580f711d7c96
author Dan Willemsen <dwillemsen@google.com> Sun May 03 21:28:32 2020 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon May 04 00:05:47 2020 -0700
tree beefad7eb2722324f9a26ade636dfd4c38640c9d
parent b39e15d3f37841ecd964b518673214cab5c3c1ea

Don't tell make about modules in other namespaces

This was causing build breaks when different devices moved to Android.bp
at different times.

Bug: 150878976
Test: build *_hwasan targets
Change-Id: I68912bb6a5696809c318d1ec816a1bcfbe2df245
Merged-In: I68912bb6a5696809c318d1ec816a1bcfbe2df245
(cherry picked from commit 7b6af23db670fd48524b4696d37a4c8ba73d8a61)

cc/sanitize.go

diff --git a/cc/sanitize.go b/cc/sanitize.go
index d32efda..3412c9b 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -1041,7 +1041,7 @@
 					}
 
 					// Export the static lib name to make
-					if c.static() {
+					if c.static() && c.ExportedToMake() {
 						if t == cfi {
 							appendStringSync(c.Name(), cfiStaticLibs(mctx.Config()), &cfiStaticLibsMutex)
 						} else if t == hwasan {