Merge "Don't return null for an interface type." (56e02905) · Commits · e / os / android_build_soong

java/dexpreopt_bootjars.go

+5 −6

Original line number	Diff line number	Diff line
		@@ -335,13 +335,12 @@ It is likely that the boot classpath is inconsistent.
		Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see verification errors.`

		func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missingDeps []string) android.WritablePath {
		return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {
		global := dexpreoptGlobalConfig(ctx)

		if !global.UseProfileForBootImage \|\| ctx.Config().IsPdkBuild() \|\| ctx.Config().UnbundledBuild() {
		return nil
		}

		return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {
		tools := global.Tools

		rule := android.NewRuleBuilder()