Convert cc modules to use AndroidMkInfoProvider.
Bug: 358427516
Test: Unit tests and manually compare generated mk files.
Change-Id: I90d8ecb3580d6324ed53212d01d7c24b6e4bb700
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 1d2f3fb..b3851e6 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -9269,7 +9269,7 @@
type modAndMkEntries struct {
mod *cc.Module
- mkEntries android.AndroidMkEntries
+ mkEntries android.AndroidMkInfo
}
entries := []*modAndMkEntries{}
@@ -9283,7 +9283,10 @@
if !mod.Enabled(android.PanickingConfigAndErrorContext(ctx)) || mod.IsHideFromMake() {
continue
}
- for _, ent := range android.AndroidMkEntriesForTest(t, ctx, mod) {
+ info := android.AndroidMkInfoForTest(t, ctx, mod)
+ ents := []android.AndroidMkInfo{info.PrimaryInfo}
+ ents = append(ents, info.ExtraInfo...)
+ for _, ent := range ents {
if ent.Disabled {
continue
}