Merge "Fix library order in class loader context to agree with PackageManager."

This commit is contained in:
Treehugger Robot
2020-12-23 19:58:25 +00:00
committed by Gerrit Code Review
3 changed files with 66 additions and 4 deletions

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