Merge "Rename generate proto config file to match classpath type."

This commit is contained in:
satayev
2021-05-25 14:17:04 +00:00
committed by Gerrit Code Review
5 changed files with 13 additions and 13 deletions

View File

@@ -382,7 +382,7 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) {
).RunTest(t)
ensureExactContents(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{
"etc/classpaths/mybootclasspathfragment.pb",
"etc/classpaths/bootclasspath.pb",
"javalib/arm/boot.art",
"javalib/arm/boot.oat",
"javalib/arm/boot.vdex",
@@ -594,7 +594,7 @@ func TestBootclasspathFragmentContentsNoName(t *testing.T) {
ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
// This does not include art, oat or vdex files as they are only included for the art boot
// image.
"etc/classpaths/mybootclasspathfragment.pb",
"etc/classpaths/bootclasspath.pb",
"javalib/bar.jar",
"javalib/foo.jar",
})