Revert "Convert cc modules to use AndroidMkInfoProvider."
This reverts commit 5640008749795a6ebfb2680e28daa6b067207ce8.
Reason for revert: Droidmonitor created revert due to b/374130363. Will be verifying through ABTD before submission.
Change-Id: Iced10a8b71766826465966e9370cdd5e347e7b79
diff --git a/cc/sanitize.go b/cc/sanitize.go
index 18851d1..498ef7c 100644
--- a/cc/sanitize.go
+++ b/cc/sanitize.go
@@ -992,7 +992,7 @@
return flags
}
-func (s *sanitize) prepareAndroidMKProviderInfo(config android.Config, ctx AndroidMkContext, entries *android.AndroidMkInfo) {
+func (s *sanitize) AndroidMkEntries(ctx AndroidMkContext, entries *android.AndroidMkEntries) {
// Add a suffix for cfi/hwasan/scs-enabled static/header libraries to allow surfacing
// both the sanitized and non-sanitized variants to make without a name conflict.
if entries.Class == "STATIC_LIBRARIES" || entries.Class == "HEADER_LIBRARIES" {
@@ -1905,13 +1905,11 @@
ctx.SetOutputFiles(android.Paths{txt.outputFile}, "")
}
-func (txt *sanitizerLibrariesTxtModule) PrepareAndroidMKProviderInfo(config android.Config) *android.AndroidMkProviderInfo {
- return &android.AndroidMkProviderInfo{
- PrimaryInfo: android.AndroidMkInfo{
- Class: "ETC",
- OutputFile: android.OptionalPathForPath(txt.outputFile),
- },
- }
+func (txt *sanitizerLibrariesTxtModule) AndroidMkEntries() []android.AndroidMkEntries {
+ return []android.AndroidMkEntries{{
+ Class: "ETC",
+ OutputFile: android.OptionalPathForPath(txt.outputFile),
+ }}
}
// PrebuiltEtcModule interface