resolved conflicts for merge of 0287a8f6
to lmp-mr1-ub-dev
Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
This commit is contained in:
commit
e9a8f46585
5 changed files with 5 additions and 5 deletions
|
@ -68,7 +68,7 @@ USE_OPENGL_RENDERER := true
|
|||
VSYNC_EVENT_PHASE_OFFSET_NS := 0
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
|
|
@ -76,7 +76,7 @@ BUILD_EMULATOR_OPENGL := true
|
|||
USE_OPENGL_RENDERER := true
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
|
|
@ -53,7 +53,7 @@ BUILD_EMULATOR_OPENGL := true
|
|||
USE_OPENGL_RENDERER := true
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
|
|
@ -35,7 +35,7 @@ BUILD_EMULATOR_OPENGL := true
|
|||
USE_OPENGL_RENDERER := true
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280 # 1.25 GB
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
|
|
@ -41,7 +41,7 @@ BUILD_EMULATOR_OPENGL := true
|
|||
USE_OPENGL_RENDERER := true
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 # 1GB
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1342177280
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
|
||||
BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016
|
||||
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
|
||||
|
|
Loading…
Reference in a new issue