diff options
| author | satayev <satayev@google.com> | 2021-05-20 21:35:06 +0100 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-05-24 13:38:45 +0100 |
| commit | 53d0678b576c5a732424c2ff89329af8f22eca01 (patch) | |
| tree | 9b5c9797f8ce9a4f4b1b9e200d10dea23cd7d482 /apex | |
| parent | b40610ad00c64c2d68647cce1bd27e8627c3e43d (diff) | |
| download | soong-53d0678b576c5a732424c2ff89329af8f22eca01.tar.gz | |
Rename generate proto config file to match classpath type.
There is no need to leak soong module names.
Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426
Merged-In: I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/bootclasspath_fragment_test.go | 4 | ||||
| -rw-r--r-- | apex/systemserver_classpath_fragment_test.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index b3f70cdac..64dd56318 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -279,7 +279,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", @@ -491,7 +491,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", }) diff --git a/apex/systemserver_classpath_fragment_test.go b/apex/systemserver_classpath_fragment_test.go index e1a101ad9..95b6e230d 100644 --- a/apex/systemserver_classpath_fragment_test.go +++ b/apex/systemserver_classpath_fragment_test.go @@ -67,7 +67,7 @@ func TestSystemserverclasspathFragmentContents(t *testing.T) { `) ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{ - "etc/classpaths/mysystemserverclasspathfragment.pb", + "etc/classpaths/systemserverclasspath.pb", "javalib/foo.jar", }) |