Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bbfef87 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent a1d6025a

apex/boot_image_test.go

+10 −0
Original line number Diff line number Diff line
@@ -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"),

java/boot_image.go

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ type BootImageModule struct { 
func bootImageFactory() android.Module {

	m := &BootImageModule{}

	m.AddProperties(&m.properties)

	android.InitAndroidArchModule(m, android.HostAndDeviceDefault, android.MultilibCommon)

	android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)

	android.InitApexModule(m)

	return m

}

java/testing.go

+0 −10
Original line number Diff line number Diff line
@@ -219,16 +219,6 @@ func GatherRequiredDepsForTest() string { 
		dex_bootjars {

			name: "dex_bootjars",

		}



		boot_image {

			name: "art-boot-image",

			image_name: "art",

		}



		boot_image {

			name: "framework-boot-image",

			image_name: "boot",

		}

`



	return bp