Merge "ramdisk_module and dtb_prebuild properties are optional" (fe306aba) · Commits · e / os / android_build_soong

filesystem/bootimg.go

+14 −18

Original line number	Diff line number	Diff line
		@@ -145,12 +145,10 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
		}

		dtbName := proptools.String(b.properties.Dtb_prebuilt)
		if dtbName == "" {
		ctx.PropertyErrorf("dtb_prebuilt", "must be set")
		return output
		}
		if dtbName != "" {
		dtb := android.PathForModuleSrc(ctx, dtbName)
		cmd.FlagWithInput("--dtb ", dtb)
		}

		cmdline := strings.Join(b.properties.Cmdline, " ")
		if cmdline != "" {
		@@ -178,10 +176,7 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
		cmd.FlagWithArg("--header_version ", headerVersion)

		ramdiskName := proptools.String(b.properties.Ramdisk_module)
		if ramdiskName == "" {
		ctx.PropertyErrorf("ramdisk_module", "must be set")
		return output
		}
		if ramdiskName != "" {
		ramdisk := ctx.GetDirectDepWithTag(ramdiskName, bootimgRamdiskDep)
		if filesystem, ok := ramdisk.(*filesystem); ok {
		flag := "--ramdisk "
		@@ -193,6 +188,7 @@ func (b *bootimg) buildBootImage(ctx android.ModuleContext, vendor bool) android
		ctx.PropertyErrorf("ramdisk", "%q is not android_filesystem module", ramdisk.Name())
		return output
		}
		}

		bootconfig := proptools.String(b.properties.Bootconfig)
		if bootconfig != "" {