StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Fix non-determinism in prebuilt selection"" into main am: 5354483c12 am: 1e9810748e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2984372

Change-Id: Ied7c0c39b23d6187523b31a92c0851c43349149a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2024-02-29 18:27:48 +00:00
committed by Automerger Merge Worker
parent d693e1c289 1e9810748e
commit 341f6c7223
3 changed files with 3 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex_test.go
View File

@@ -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)
})
}