diff options
| author | 2024-10-15 20:45:35 +0000 | |
|---|---|---|
| committer | 2024-10-15 21:03:29 +0000 | |
| commit | 5640008749795a6ebfb2680e28daa6b067207ce8 (patch) | |
| tree | d328801cd3f706edfc14d003ba5a942aa1ff2d6a /apex/apex_test.go | |
| parent | 0636fa36fbc7cbe49c75f0864456a5db155ef956 (diff) | |
Convert cc modules to use AndroidMkInfoProvider.
Bug: 358427516
Test: Unit tests and manually compare generated mk files.
Change-Id: I90d8ecb3580d6324ed53212d01d7c24b6e4bb700
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 1d2f3fb9d..b3851e6ea 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.AndroidMkEntries + mkEntries android.AndroidMkInfo } entries := []*modAndMkEntries{} @@ -9283,7 +9283,10 @@ func TestPrebuiltStubLibDep(t *testing.T) { if !mod.Enabled(android.PanickingConfigAndErrorContext(ctx)) || mod.IsHideFromMake() { continue } - for _, ent := range android.AndroidMkEntriesForTest(t, ctx, mod) { + info := android.AndroidMkInfoForTest(t, ctx, mod) + ents := []android.AndroidMkInfo{info.PrimaryInfo} + ents = append(ents, info.ExtraInfo...) + for _, ent := range ents { if ent.Disabled { continue } |