commit e70976d4d537dc69cb9f53557251065f3beb1a72
author Yu Liu <yudiliu@google.com> Tue Oct 15 20:45:35 2024 +0000
committer Yu Liu <yudiliu@google.com> Tue Oct 29 19:21:44 2024 +0000
tree f9147acc403b809227567938549ab0c4fa4dd22d
parent cc723c5a2727e5c111d0f4cad7bd9e042371b066

Revert^2 "Convert cc modules to use AndroidMkInfoProvider."

This reverts commit 37e6794ad44926e64c1f733dbe32bbf5a40efe77.

Reason for revert: reland with fix to the test

Bug: 358427516
Test: Unit tests and manually compare generated mk files.
Change-Id: Iddc34471f15cfe0c8ed863d05a1344e295925565

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index e412528..4cda633 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -878,7 +878,7 @@
 
 	cachedToolchain config.Toolchain
 
-	subAndroidMkOnce map[subAndroidMkProvider]bool
+	subAndroidMkOnce map[subAndroidMkProviderInfoProducer]bool
 
 	// Flags used to compile this module
 	flags Flags