diff options
| author | Spandan Das <spandandas@google.com> | 2024-02-29 07:54:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 07:54:03 +0000 |
| commit | 8b5ad8d31990e64128e53244906188d199b0e2a7 (patch) | |
| tree | 4c249c9898b5e24d5aebf4f09ebbf8ed219cd036 /apex | |
| parent | fa38c8c03299708c1075169740657ab7701c9e80 (diff) | |
| parent | abd735bb6ca13beb26482d23c999bd00a44f171e (diff) | |
Fix non-determinism in prebuilt selection am: 2d8884a377 am: abd735bb6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2978137
Change-Id: I460c2a2fbc0b083f95117265eb1addde08d67c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex')
| -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 cc2d4ef17..64e962e8d 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) }) } |