diff options
| author | Spandan Das <spandandas@google.com> | 2024-02-29 08:22:47 +0000 |
|---|---|---|
| committer | Spandan Das <spandandas@google.com> | 2024-02-29 08:57:08 +0000 |
| commit | af66212522c48c18185ba9c7d2d3f57160b43e99 (patch) | |
| tree | 4c1a95ca1dd52255ec6effb39a13a7a5f61769bb /apex | |
| parent | 2d8884a37757edc6b984e1e073ab5a9e4a85f778 (diff) | |
Revert "Fix non-determinism in prebuilt selection"
This reverts commit 2d8884a37757edc6b984e1e073ab5a9e4a85f778.
Reason for revert: Build breakage https://groups.google.com/a/google.com/g/android-build-police-core/c/00mM-B9unVg/m/0FxBxpMbAwAJ. The validation does not check for namespace isolation which breaks libtonemap
Change-Id: Ieb4d3bc4f3ade856877ebb62a567620f5a1ed08c
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 65f0a235b..85d1d712a 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 module error", func(t *testing.T) { + t.Run("Co-existing unflagged apexes should create a duplicate deapexer error in hiddenapi processing", func(t *testing.T) { bp := ` // Source apex { @@ -6273,7 +6273,7 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { } ` - testDexpreoptWithApexes(t, bp, "Multiple prebuilt modules prebuilt_myapex.v1 and prebuilt_myapex.v2 have been marked as preferred for this source module", preparer, fragment) + testDexpreoptWithApexes(t, bp, "Multiple installable prebuilt APEXes provide ambiguous deapexers: prebuilt_myapex.v1 and prebuilt_myapex.v2", preparer, fragment) }) } |