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

Commit b7e5985f authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

Merge "Skip dexbootjar check using AllowMissingDependencies flag"

parents 45de13f9 10ea4bf9

apex/apex_test.go

+6 −0
Original line number Diff line number Diff line
@@ -5129,6 +5129,12 @@ func TestBootDexJarsFromSourcesAndPrebuilts(t *testing.T) { 
		// find the dex boot jar in it. We either need to disable the source libfoo

		// or make the prebuilt libfoo preferred.

		testDexpreoptWithApexes(t, bp, "module libfoo does not provide a dex boot jar", preparer, fragment)

		// dexbootjar check is skipped if AllowMissingDependencies is true

		preparerAllowMissingDeps := android.GroupFixturePreparers(

			preparer,

			android.PrepareForTestWithAllowMissingDependencies,

		)

		testDexpreoptWithApexes(t, bp, "", preparerAllowMissingDeps, fragment)

	})



	t.Run("prebuilt library preferred with source", func(t *testing.T) {

java/dexpreopt_bootjars.go

+5 −1
Original line number Diff line number Diff line
@@ -500,7 +500,11 @@ func copyBootJarsToPredefinedLocations(ctx android.ModuleContext, srcBootDexJars 
		dst := dstBootJarsByModule[name]



		if src == nil {

			if !ctx.Config().AllowMissingDependencies() {

				ctx.ModuleErrorf("module %s does not provide a dex boot jar", name)

			} else {

				ctx.AddMissingDependencies([]string{name})

			}

		} else if dst == nil {

			ctx.ModuleErrorf("module %s is not part of the boot configuration", name)

		} else {