diff options
| author | Ying Wang <wangying@google.com> | 2010-08-25 14:29:34 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-08-25 14:30:17 -0700 |
| commit | 4de6b5bfc89de95b18514e75329a2ec7491bebbd (patch) | |
| tree | bd4ca200a86c2c84d4474d5dc764f3df5efd616f | |
| parent | 0962b71980b7e850a1ef87766ae12de16ab2efb4 (diff) | |
| download | build-4de6b5bfc89de95b18514e75329a2ec7491bebbd.zip build-4de6b5bfc89de95b18514e75329a2ec7491bebbd.tar.gz build-4de6b5bfc89de95b18514e75329a2ec7491bebbd.tar.bz2 | |
Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
| -rw-r--r-- | core/Makefile | 10 | ||||
| -rw-r--r-- | tools/releasetools/common.py | 5 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index fbfe113..5060e45 100644 --- a/core/Makefile +++ b/core/Makefile @@ -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 @@ -949,6 +953,9 @@ 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 $(hide) $(call package_files-copy-root, \ @@ -966,6 +973,9 @@ 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; \ $(ACP) $(t) $(zip_root)/RADIO/$(notdir $(t));) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index ab6678a..037c4cf 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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]) |