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

Commit 107f92ef authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Handle boot jars on /system_ext correctly."

parents 76f88384 e736e13a

java/dexpreopt_bootjars.go

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ func getBootJar(ctx android.SingletonContext, bootjars android.ConfiguredJarList 


	// Now match the apex part of the boot image configuration.

	requiredApex := bootjars.Apex(index)

	if requiredApex == "platform" {

	if requiredApex == "platform" || requiredApex == "system_ext" {

		if len(apexInfo.InApexes) != 0 {

			// A platform variant is required but this is for an apex so ignore it.

			return -1, nil, nil

java/dexpreopt_bootjars_test.go

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu 
			name: "bar",

			srcs: ["b.java"],

			installable: true,

			system_ext_specific: true,

		}



		dex_import {
@@ -47,7 +48,7 @@ func testDexpreoptBoot(t *testing.T, ruleFile string, expectedInputs, expectedOu 
		prepareForJavaTest,

		PrepareForTestWithJavaSdkLibraryFiles,

		FixtureWithLastReleaseApis("foo"),

		dexpreopt.FixtureSetBootJars("platform:foo", "platform:bar", "platform:baz"),

		dexpreopt.FixtureSetBootJars("platform:foo", "system_ext:bar", "platform:baz"),

	).RunTestWithBp(t, bp)



	dexpreoptBootJars := result.SingletonForTests("dex_bootjars")