diff options
| author | Artur Satayev <satayev@google.com> | 2021-05-25 19:40:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-05-25 19:40:05 +0000 |
| commit | f1adfb38fba8f175ae781af22106ceb6ab56f745 (patch) | |
| tree | 7157fa818f5b534d3c2ed48695c920da19ff93e4 /java/platform_bootclasspath_test.go | |
| parent | bbe2d3db4a471074424ac7e3a1453790621b8d1b (diff) | |
| parent | 53d0678b576c5a732424c2ff89329af8f22eca01 (diff) | |
Merge "Rename generate proto config file to match classpath type." into sc-dev
Diffstat (limited to 'java/platform_bootclasspath_test.go')
| -rw-r--r-- | java/platform_bootclasspath_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/platform_bootclasspath_test.go b/java/platform_bootclasspath_test.go index d332f63df..ed5549d35 100644 --- a/java/platform_bootclasspath_test.go +++ b/java/platform_bootclasspath_test.go @@ -287,7 +287,7 @@ func TestPlatformBootclasspath_ClasspathFragmentPaths(t *testing.T) { ).RunTest(t) p := result.Module("platform-bootclasspath", "android_common").(*platformBootclasspathModule) - android.AssertStringEquals(t, "output filepath", p.Name()+".pb", p.ClasspathFragmentBase.outputFilepath.Base()) + android.AssertStringEquals(t, "output filepath", "bootclasspath.pb", p.ClasspathFragmentBase.outputFilepath.Base()) android.AssertPathRelativeToTopEquals(t, "install filepath", "out/soong/target/product/test_device/system/etc/classpaths", p.ClasspathFragmentBase.installDirPath) } @@ -327,7 +327,7 @@ func TestPlatformBootclasspathModule_AndroidMkEntries(t *testing.T) { want := map[string][]string{ "LOCAL_MODULE": {"platform-bootclasspath"}, "LOCAL_MODULE_CLASS": {"ETC"}, - "LOCAL_INSTALLED_MODULE_STEM": {"platform-bootclasspath.pb"}, + "LOCAL_INSTALLED_MODULE_STEM": {"bootclasspath.pb"}, // Output and Install paths are tested separately in TestPlatformBootclasspath_ClasspathFragmentPaths } |