diff options
| author | 2021-05-06 23:59:58 +0100 | |
|---|---|---|
| committer | 2021-05-11 10:34:47 +0100 | |
| commit | 3db3547d1fc19a18aa180d3b929270a6736fb501 (patch) | |
| tree | 50ac52313fef9e5b5c652f80e982d155a006d5f3 /apex/bootclasspath_fragment_test.go | |
| parent | 73c7b8547adfabb6dcd0837b51bde25a65ae8617 (diff) | |
Generate empty classpaths.proto for bootclasspath_fragment.go.
- Adds all required details for bootclasspath_fragment to implement
classpath_fragment.
- Keeps the actual boot jars in platform-bootclasspath to begin with.
- Makes sure to put the file in apex/etc/classpath on device. Note that
for platform versions of classpath fragment AndroidMkEntries perform
the installation, while for APEXes it must be plumbed via apex.go.
Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I6101ebdf5b8bcbe95c0b7ce21f3f67a2685aef50
Diffstat (limited to 'apex/bootclasspath_fragment_test.go')
| -rw-r--r-- | apex/bootclasspath_fragment_test.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index e2b320ca0..7bb3ff611 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -279,6 +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", "javalib/arm/boot.art", "javalib/arm/boot.oat", "javalib/arm/boot.vdex", @@ -481,6 +482,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", "javalib/bar.jar", "javalib/foo.jar", }) |