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

Commit 27c7cc6c authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

Don't return null for an interface type. 

Otherwise we get:
internal error: panic in GenerateBuildActions for singleton dex_bootjars
interface conversion: interface is nil, not android.WritablePath

Test: build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I9d8484994d1b5120f0187861a8acaf20e94827f6
parent d79df83b

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()