diff options
| author | Ying Wang <wangying@google.com> | 2010-08-25 15:04:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-25 15:04:45 -0700 |
| commit | eed6860d388f1761405d7165cb4d72e1f038b8a6 (patch) | |
| tree | bb72e95155a3a262d8f723cc350d527a78e958d7 | |
| parent | 1ad138059922bcd94674b9d277bd1a83a5ddcdeb (diff) | |
| parent | 4de6b5bfc89de95b18514e75329a2ec7491bebbd (diff) | |
| download | build-eed6860d388f1761405d7165cb4d72e1f038b8a6.zip build-eed6860d388f1761405d7165cb4d72e1f038b8a6.tar.gz build-eed6860d388f1761405d7165cb4d72e1f038b8a6.tar.bz2 | |
am 4de6b5bf: Fix mkbootimg parameters for releasetools.
Merge commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd' into gingerbread-plus-aosp
* commit '4de6b5bfc89de95b18514e75329a2ec7491bebbd':
Fix mkbootimg parameters for releasetools.
| -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 0573645..9515046 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 @@ -981,6 +985,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, \ @@ -998,6 +1005,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]) |