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/library_headers_test.go b/cc/library_headers_test.go
index 5a45767..1924b2f 100644
--- a/cc/library_headers_test.go
+++ b/cc/library_headers_test.go
@@ -46,7 +46,7 @@
// Test that there's a valid AndroidMk entry.
headers := ctx.ModuleForTests("headers", "android_arm64_armv8-a").Module()
- e := android.AndroidMkInfoForTest(t, ctx, headers).PrimaryInfo
+ e := android.AndroidMkEntriesForTest(t, ctx, headers)[0]
// This duplicates the tests done in AndroidMkEntries.write. It would be
// better to test its output, but there are no test functions that capture that.