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/apex/apex_test.go b/apex/apex_test.go
index b3851e6..1d2f3fb 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -9269,7 +9269,7 @@
type modAndMkEntries struct {
mod *cc.Module
- mkEntries android.AndroidMkInfo
+ mkEntries android.AndroidMkEntries
}
entries := []*modAndMkEntries{}
@@ -9283,10 +9283,7 @@
if !mod.Enabled(android.PanickingConfigAndErrorContext(ctx)) || mod.IsHideFromMake() {
continue
}
- info := android.AndroidMkInfoForTest(t, ctx, mod)
- ents := []android.AndroidMkInfo{info.PrimaryInfo}
- ents = append(ents, info.ExtraInfo...)
- for _, ent := range ents {
+ for _, ent := range android.AndroidMkEntriesForTest(t, ctx, mod) {
if ent.Disabled {
continue
}