am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"

* commit 'e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
  Use ext4 file system for generic_x86 userdata partition
This commit is contained in:
Jean-Baptiste Queru
2010-12-29 14:31:00 -08:00
committed by Android Git Automerger

View File

@@ -9,7 +9,7 @@ USE_CAMERA_STUB := true
TARGET_PROVIDES_INIT_RC := true
USE_CUSTOM_RUNTIME_HEAP_MAX := "32M"
TARGET_CPU_ABI := x86
TARGET_USERIMAGES_USE_EXT2 := true
TARGET_USERIMAGES_USE_EXT4 := true
TARGET_BOOTIMAGE_USE_EXT2 := true
# For VirtualBox and likely other emulators
@@ -20,6 +20,8 @@ TARGET_DISK_LAYOUT_CONFIG := build/target/board/generic_x86/disk_layout.conf
BOARD_BOOTIMAGE_MAX_SIZE := 8388608
BOARD_SYSLOADER_MAX_SIZE := 7340032
BOARD_FLASH_BLOCK_SIZE := 512
BOARD_USERDATAIMAGE_PARTITION_SIZE := 50M
BOARD_INSTALLERIMAGE_PARTITION_SIZE := 500M
# The eth0 device should be started with dhcp on boot.