Fix some minor issues with boot_image

Mistakenly used HostAndDeviceDefault (which builds host and device
variants by default) instead of HostAndDeviceSupported which only
builds a device variant by default.

Moved the test definitions of art and framework boot images from being
defined in all Java related tests into the test where they belong. This
is needed in order to improve the ART and framework boot image specific
testing.

Bug: 177892522
Test: m droid
Change-Id: I16771f09bd789033e18c58ae6dd4b6b9e865d831
This commit is contained in:
Paul Duffin
2021-01-30 12:57:26 +00:00
parent a1d6025a49
commit 5bbfef8718
3 changed files with 11 additions and 11 deletions

View File

@@ -71,6 +71,16 @@ func TestBootImages(t *testing.T) {
],
srcs: ["b.java"],
}
boot_image {
name: "art-boot-image",
image_name: "art",
}
boot_image {
name: "framework-boot-image",
image_name: "boot",
}
`,
// Configure some libraries in the art and framework boot images.
withArtBootImageJars("com.android.art:baz", "com.android.art:quuz"),