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

Merge "Fix library order in class loader context to agree with PackageManager." am: 7dbc5786e3 am: 13b56f815f am: 49977f12c3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38389beaad89ec6177e4f9eedba3585ad9e8ae59
This commit is contained in:
Treehugger Robot
2020-12-23 21:17:19 +00:00
committed by Automerger Merge Worker
parent 496ea93244 49977f12c3
commit fc84e8b4d7
3 changed files with 66 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/app_test.go
View File

@@ -2896,8 +2896,8 @@ func TestUsesLibraries(t *testing.T) {
// Test conditional context for target SDK version 29.
if w := `--target-context-for-sdk 29` +
` PCL[/system/framework/android.hidl.base-V1.0-java.jar]` +
`#PCL[/system/framework/android.hidl.manager-V1.0-java.jar] `; !strings.Contains(cmd, w) {
` PCL[/system/framework/android.hidl.manager-V1.0-java.jar]` +
`#PCL[/system/framework/android.hidl.base-V1.0-java.jar] `; !strings.Contains(cmd, w) {
t.Errorf("wanted %q in %q", w, cmd)
}