resolved conflicts for merge of 87eb4007
to mnc-dr-dev-plus-aosp
Change-Id: I7cf9b0153457f9cfba93966db78e0c04b5d216aa
This commit is contained in:
commit
58251fe44d
2 changed files with 2 additions and 2 deletions
|
@ -68,7 +68,7 @@ USE_OPENGL_RENDERER := true
|
||||||
VSYNC_EVENT_PHASE_OFFSET_NS := 0
|
VSYNC_EVENT_PHASE_OFFSET_NS := 0
|
||||||
|
|
||||||
TARGET_USERIMAGES_USE_EXT4 := true
|
TARGET_USERIMAGES_USE_EXT4 := true
|
||||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
|
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
|
||||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
|
|
|
@ -76,7 +76,7 @@ BUILD_EMULATOR_OPENGL := true
|
||||||
USE_OPENGL_RENDERER := true
|
USE_OPENGL_RENDERER := true
|
||||||
|
|
||||||
TARGET_USERIMAGES_USE_EXT4 := true
|
TARGET_USERIMAGES_USE_EXT4 := true
|
||||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1258291200
|
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
|
||||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||||
|
|
Loading…
Reference in a new issue