Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9a8f465 authored by Konstantinos Menychtas's avatar Konstantinos Menychtas
Browse files

resolved conflicts for merge of 0287a8f6 to lmp-mr1-ub-dev 

Change-Id: I1c5e60988d95e8ee73fb4cee632750ecb69b81f5
parents 1dca55fd 0287a8f6

target/board/generic/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_arm64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_mips/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_x86/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_x86_64/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -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