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/aconfig/codegen/cc_aconfig_library_test.go b/aconfig/codegen/cc_aconfig_library_test.go
index 2f6c1a6..c308ed4 100644
--- a/aconfig/codegen/cc_aconfig_library_test.go
+++ b/aconfig/codegen/cc_aconfig_library_test.go
@@ -211,7 +211,7 @@
module := result.ModuleForTests("my_cc_library", "android_vendor_arm64_armv8-a_shared").Module()
- entry := android.AndroidMkEntriesForTest(t, result.TestContext, module)[0]
+ entry := android.AndroidMkInfoForTest(t, result.TestContext, module).PrimaryInfo
makeVar := entry.EntryMap["LOCAL_ACONFIG_FILES"]
android.EnsureListContainsSuffix(t, makeVar, "my_aconfig_declarations_foo/intermediate.pb")