am 58251fe4: resolved conflicts for merge of 87eb4007 to mnc-dr-dev-plus-aosp

* commit '58251fe44d120b284bcdc47c3f28fbdfa6fb524d':
  Increasing arm(64)? emulator partition sizes to 1.5GB
This commit is contained in:
Ian Pedowitz 2015-08-11 23:14:09 +00:00 committed by Android Git Automerger
commit eef23a78b8
2 changed files with 2 additions and 2 deletions

View File

@ -68,7 +68,7 @@ USE_OPENGL_RENDERER := true
VSYNC_EVENT_PHASE_OFFSET_NS := 0
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

View File

@ -76,7 +76,7 @@ BUILD_EMULATOR_OPENGL := true
USE_OPENGL_RENDERER := true
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1258291200
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4