diff options
| author | 2024-10-17 18:58:08 +0000 | |
|---|---|---|
| committer | 2024-10-17 18:58:08 +0000 | |
| commit | 37e6794ad44926e64c1f733dbe32bbf5a40efe77 (patch) | |
| tree | 3bf5364d702d0d681f64f9e0629a93eab7fcebee /apex/apex_test.go | |
| parent | 5640008749795a6ebfb2680e28daa6b067207ce8 (diff) | |
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
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index b3851e6ea..1d2f3fb9d 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -9269,7 +9269,7 @@ func TestPrebuiltStubLibDep(t *testing.T) { type modAndMkEntries struct { mod *cc.Module - mkEntries android.AndroidMkInfo + mkEntries android.AndroidMkEntries } entries := []*modAndMkEntries{} @@ -9283,10 +9283,7 @@ func TestPrebuiltStubLibDep(t *testing.T) { if !mod.Enabled(android.PanickingConfigAndErrorContext(ctx)) || mod.IsHideFromMake() { continue } - info := android.AndroidMkInfoForTest(t, ctx, mod) - ents := []android.AndroidMkInfo{info.PrimaryInfo} - ents = append(ents, info.ExtraInfo...) - for _, ent := range ents { + for _, ent := range android.AndroidMkEntriesForTest(t, ctx, mod) { if ent.Disabled { continue } |