diff options
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/java/app_test.go b/java/app_test.go index f2e434957..8c7757336 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2812,51 +2812,52 @@ func TestUsesLibraries(t *testing.T) { t.Errorf("wanted %q in %q", w, cmd) } - // Test that all present libraries are preopted, including implicit SDK dependencies, possibly stubs. + // Test that all present libraries are preopted, including implicit SDK dependencies, possibly stubs cmd = app.Rule("dexpreopt").RuleParams.Command - w := `--target-classpath-for-sdk any` + - ` /system/framework/foo.jar` + - `:/system/framework/quuz.jar` + - `:/system/framework/qux.jar` + - `:/system/framework/runtime-library.jar` + - `:/system/framework/bar.jar ` + w := `--target-context-for-sdk any ` + + `PCL[/system/framework/foo.jar]#` + + `PCL[/system/framework/quuz.jar]#` + + `PCL[/system/framework/qux.jar]#` + + `PCL[/system/framework/runtime-library.jar]#` + + `PCL[/system/framework/bar.jar]` if !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } // Test conditional context for target SDK version 28. - if w := `--target-classpath-for-sdk 28` + - ` /system/framework/org.apache.http.legacy.jar `; !strings.Contains(cmd, w) { + if w := `--target-context-for-sdk 28` + + ` PCL[/system/framework/org.apache.http.legacy.jar] `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } // Test conditional context for target SDK version 29. - if w := `--target-classpath-for-sdk 29` + - ` /system/framework/android.hidl.base-V1.0-java.jar` + - `:/system/framework/android.hidl.manager-V1.0-java.jar `; !strings.Contains(cmd, w) { + // Hardcoded dependency "android.hidl.manager" -> "android.hidl.base" is present. + 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]{PCL[/system/framework/android.hidl.base-V1.0-java.jar]} `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } // Test conditional context for target SDK version 30. // "android.test.mock" is absent because "android.test.runner" is not used. - if w := `--target-classpath-for-sdk 30` + - ` /system/framework/android.test.base.jar `; !strings.Contains(cmd, w) { + if w := `--target-context-for-sdk 30` + + ` PCL[/system/framework/android.test.base.jar] `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } cmd = prebuilt.Rule("dexpreopt").RuleParams.Command - if w := `--target-classpath-for-sdk any` + - ` /system/framework/foo.jar` + - `:/system/framework/android.test.runner.jar` + - `:/system/framework/bar.jar `; !strings.Contains(cmd, w) { + if w := `--target-context-for-sdk any` + + ` PCL[/system/framework/foo.jar]` + + `#PCL[/system/framework/android.test.runner.jar]` + + `#PCL[/system/framework/bar.jar] `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } // Test conditional context for target SDK version 30. // "android.test.mock" is present because "android.test.runner" is used. - if w := `--target-classpath-for-sdk 30` + - ` /system/framework/android.test.base.jar` + - `:/system/framework/android.test.mock.jar `; !strings.Contains(cmd, w) { + if w := `--target-context-for-sdk 30` + + ` PCL[/system/framework/android.test.base.jar]` + + `#PCL[/system/framework/android.test.mock.jar] `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } } |