StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 2927f2185c to stage-dr1-aosp-master

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
This commit is contained in:
SzuWei Lin
2018-07-23 16:28:14 +08:00
parent e4507d8579 2927f2185c
commit db3d1712f5
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/board/generic/BoardConfig.mk
View File

@@ -48,7 +48,6 @@ TARGET_CPU_ABI2 := armeabi
include build/make/target/board/BoardConfigEmuCommon.mk
include build/make/target/board/BoardConfigGsiCommon.mk
TARGET_USERIMAGES_USE_EXT4 := true
# Partition size is default 1.5GB (1536MB) for 64 bits projects
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800