diff options
| author | 2024-03-04 10:49:39 +0000 | |
|---|---|---|
| committer | 2024-03-04 10:49:39 +0000 | |
| commit | 2391caf42dd401944ce343aa47136b9d2a1a26be (patch) | |
| tree | 9a204f9080bfe71ed7c90c2a93349ddb4880113d /apex/apex_test.go | |
| parent | 7e02849734dd4db380cb9bd42275c8a8e4caed81 (diff) | |
| parent | d1816e09f0a1ec71532a711731ddccc774ae799b (diff) | |
Fix non-determinism in prebuilt selection am: f2c1057586 am: d1816e09f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984036
Change-Id: I6062c3ccd1e864bd2d5cd7790957db99b6a76f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 74d6de8c7..9dc77c28d 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -6199,7 +6199,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { `) }) - t.Run("Co-existing unflagged apexes should create a duplicate deapexer error in hiddenapi processing", func(t *testing.T) { + t.Run("Co-existing unflagged apexes should create a duplicate module error", func(t *testing.T) { bp := ` // Source apex { @@ -6273,7 +6273,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { } ` - testDexpreoptWithApexes(t, bp, "Multiple installable prebuilt APEXes provide ambiguous deapexers: prebuilt_myapex.v1 and prebuilt_myapex.v2", preparer, fragment) + testDexpreoptWithApexes(t, bp, "Multiple prebuilt modules prebuilt_myapex.v1 and prebuilt_myapex.v2 have been marked as preferred for this source module", preparer, fragment) }) } |