commit 37e6794ad44926e64c1f733dbe32bbf5a40efe77
author Priyanka Advani (xWF) <padvani@google.com> Thu Oct 17 18:58:08 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 17 18:58:08 2024 +0000
tree 3bf5364d702d0d681f64f9e0629a93eab7fcebee
parent 5640008749795a6ebfb2680e28daa6b067207ce8

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

aconfig/codegen/cc_aconfig_library_test.go

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