diff options
author | Justin Morey <jmorey@google.com> | 2015-03-18 21:27:17 -0500 |
---|---|---|
committer | Justin Morey <jmorey@google.com> | 2015-03-18 21:29:09 -0500 |
commit | 030b5493147d47a726e9f3e0e474772b29ad3111 (patch) | |
tree | 7a84887a9e37ba524528f673730c2f06b69e3b5e /target/board | |
parent | ae61f50a680d4a8e91274b35305dc2e24959abbe (diff) | |
parent | 68000907e3411a6ef630c65748f23eaf366acf65 (diff) | |
download | build-030b5493147d47a726e9f3e0e474772b29ad3111.zip build-030b5493147d47a726e9f3e0e474772b29ad3111.tar.gz build-030b5493147d47a726e9f3e0e474772b29ad3111.tar.bz2 |
resolved conflicts for merge of 68000907 to lmp-mr1-dev
Change-Id: I9f1a80746a5d945c704cd126efebca0941e27e47
Diffstat (limited to 'target/board')
-rwxr-xr-x | target/board/generic_x86_64/BoardConfig.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 295ee2b..192bbb2 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -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 := 1073741824 # 1GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 |