diff options
| author | 2020-10-21 13:20:55 +0100 | |
|---|---|---|
| committer | 2020-10-27 17:05:30 +0000 | |
| commit | 46b3d5bd0504388a946f91565a2116b8d9980a17 (patch) | |
| tree | d4eee2a28fb27fb401e773f607c55e0e20d61a25 /java/app_test.go | |
| parent | 24813e1d8070d46817f69a5246a49784df45d2c8 (diff) | |
Fix handling of "android.test.mock" in class loader context.
Mimick the way PackageManager handles it at runtime: do add it to class
loader context for apps with targetSdkVersion < 30, but only if
"android.test.runner" is used. Previously it was not added at all.
Test: lunch aosp_cf_x86_phone-userdebug && m
Bug: 132357300
Change-Id: I4c06635277ab13e21069b9fa0b46eb6a2547dfdd
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/app_test.go b/java/app_test.go index 98945da0c..f2e434957 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -2838,6 +2838,7 @@ func TestUsesLibraries(t *testing.T) { } // 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) { t.Errorf("wanted %q in %q", w, cmd) @@ -2852,8 +2853,10 @@ func TestUsesLibraries(t *testing.T) { } // 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 `; !strings.Contains(cmd, w) { + ` /system/framework/android.test.base.jar` + + `:/system/framework/android.test.mock.jar `; !strings.Contains(cmd, w) { t.Errorf("wanted %q in %q", w, cmd) } } |