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
diff --git a/android/testing.go b/android/testing.go
index 7440869..23aadda 100644
--- a/android/testing.go
+++ b/android/testing.go
@@ -19,6 +19,7 @@
"fmt"
"path/filepath"
"regexp"
+ "runtime"
"sort"
"strings"
"sync"
@@ -1152,6 +1153,30 @@
return entriesList
}
+func AndroidMkInfoForTest(t *testing.T, ctx *TestContext, mod blueprint.Module) *AndroidMkProviderInfo {
+ if runtime.GOOS == "darwin" && mod.(Module).base().Os() != Darwin {
+ // The AndroidMkInfo provider is not set in this case.
+ t.Skip("AndroidMkInfo provider is not set on darwin")
+ }
+
+ t.Helper()
+ var ok bool
+ if _, ok = mod.(AndroidMkProviderInfoProducer); !ok {
+ t.Errorf("module does not implement AndroidMkProviderInfoProducer: " + mod.Name())
+ }
+
+ info := OtherModuleProviderOrDefault(ctx, mod, AndroidMkInfoProvider)
+ aconfigUpdateAndroidMkInfos(ctx, mod.(Module), info)
+ info.PrimaryInfo.fillInEntries(ctx, mod)
+ if len(info.ExtraInfo) > 0 {
+ for _, ei := range info.ExtraInfo {
+ ei.fillInEntries(ctx, mod)
+ }
+ }
+
+ return info
+}
+
func AndroidMkDataForTest(t *testing.T, ctx *TestContext, mod blueprint.Module) AndroidMkData {
t.Helper()
var p AndroidMkDataProvider