From: Jean-Baptiste Queru <jbq@google.com>
Date: Tue, 2 Nov 2010 21:17:54 +0000 (-0700)
Subject: am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
X-Git-Tag: android-x86-4.4-r1~1849^2~61
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6be29424;p=android-x86%2Fbuild.git

am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"

* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
  build: Add spare size flag to mkyaffs2image
---

6be29424c60cb5e17ce0aacb026c1cb88a62428b
diff --cc core/Makefile
index bf7bd06f2,7ec0cba6f..460ae3abe
--- a/core/Makefile
+++ b/core/Makefile
@@@ -692,13 -623,20 +692,17 @@@ els
  mkyaffs2_extra_flags :=
  endif
  
+ ifneq ($(BOARD_NAND_SPARE_SIZE),)
+ mkyaffs2_extra_flags += -s $(BOARD_NAND_SPARE_SIZE)
+ endif
+ 
  
  # -----------------------------------------------------------------
 -# system yaffs image
 +# system image
  #
 -# First, the "unoptimized" image, which contains .apk/.jar files
 -# that contain regular, unoptimized/unverified .dex entries.
 -#
 -systemimage_unopt_intermediates := \
 -	$(call intermediates-dir-for,PACKAGING,systemimage_unopt)
 -BUILT_SYSTEMIMAGE_UNOPT := $(systemimage_unopt_intermediates)/system.img
 +systemimage_intermediates := \
 +	$(call intermediates-dir-for,PACKAGING,systemimage)
 +BUILT_SYSTEMIMAGE := $(systemimage_intermediates)/system.img
  
  INTERNAL_SYSTEMIMAGE_FILES := $(filter $(TARGET_OUT)/%, \
  	$(ALL_PREBUILT) \