Fix mkbootimg parameters for releasetools. (4de6b5bf) · Commits · e / os / android_build

core/Makefile

+10 −0

Original line number	Diff line number	Diff line
		@@ -618,6 +618,10 @@ endif
		ifdef BOARD_KERNEL_BASE
		INTERNAL_RECOVERYIMAGE_ARGS += --base $(BOARD_KERNEL_BASE)
		endif
		BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE))
		ifdef BOARD_KERNEL_PAGESIZE
		INTERNAL_RECOVERYIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
		endif

		# Keys authorized to sign OTA packages this build will accept. The
		# build always uses test-keys for this; release packaging tools will
		@@ -948,6 +952,9 @@ ifdef BOARD_KERNEL_CMDLINE
		endif
		ifdef BOARD_KERNEL_BASE
		$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/RECOVERY/base
		endif
		ifdef BOARD_KERNEL_PAGESIZE
		$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/RECOVERY/pagesize
		endif
		@# Components of the boot image
		$(hide) mkdir -p $(zip_root)/BOOT
		@@ -965,6 +972,9 @@ ifdef BOARD_KERNEL_CMDLINE
		endif
		ifdef BOARD_KERNEL_BASE
		$(hide) echo "$(BOARD_KERNEL_BASE)" > $(zip_root)/BOOT/base
		endif
		ifdef BOARD_KERNEL_PAGESIZE
		$(hide) echo "$(BOARD_KERNEL_PAGESIZE)" > $(zip_root)/BOOT/pagesize
		endif
		$(hide) $(foreach t,$(INSTALLED_RADIOIMAGE_TARGET),\
		mkdir -p $(zip_root)/RADIO; \

+5 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,11 @@ def BuildBootableImage(sourcedir):
		cmd.append("--base")
		cmd.append(open(fn).read().rstrip("\n"))

		fn = os.path.join(sourcedir, "pagesize")
		if os.access(fn, os.F_OK):
		cmd.append("--pagesize")
		cmd.append(open(fn).read().rstrip("\n"))

		cmd.extend(["--ramdisk", ramdisk_img.name,
		"--output", img.name])