resolve merge conflicts of 2927f2185c
to stage-dr1-aosp-master
Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I7812dcb06172fd0ca5caf38ad8ee616cf1936f43
This commit is contained in:
@@ -23,7 +23,6 @@ TARGET_PRELINK_MODULE := false
|
||||
include build/make/target/board/BoardConfigEmuCommon.mk
|
||||
include build/make/target/board/BoardConfigGsiCommon.mk
|
||||
|
||||
TARGET_USERIMAGES_USE_EXT4 := true
|
||||
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
|
||||
# Resize to 4G to accomodate ASAN and CTS
|
||||
BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296
|
||||
|
Reference in New Issue
Block a user