diff options
| author | Bill Yi <byi@google.com> | 2015-02-19 14:30:26 -0800 |
|---|---|---|
| committer | Bill Yi <byi@google.com> | 2015-02-19 14:30:26 -0800 |
| commit | 251412b472c092616c3d54540495420267a8ac95 (patch) | |
| tree | c431bf3998466f53873f722a24f31c5e718f6e7c /target/board | |
| parent | 0badfcebe71805a495d151ac4df48bb48940bde0 (diff) | |
| parent | b89ec38113a22d09b0832ed2d3cb8fc413a14a75 (diff) | |
| download | build-251412b472c092616c3d54540495420267a8ac95.zip build-251412b472c092616c3d54540495420267a8ac95.tar.gz build-251412b472c092616c3d54540495420267a8ac95.tar.bz2 | |
Merge commit 'b89ec38113a22d09b0832ed2d3cb8fc413a14a75' into HEAD
Diffstat (limited to 'target/board')
| -rw-r--r-- | target/board/generic_arm64/BoardConfig.mk | 7 | ||||
| -rw-r--r-- | target/board/generic_mips/BoardConfig.mk | 2 | ||||
| -rwxr-xr-x | target/board/generic_x86_64/BoardConfig.mk | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index c57447d..8afd5a8 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -25,13 +25,13 @@ TARGET_2ND_ARCH := arm TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -ifdef TARGET_BUILD_APPS +ifneq ($(TARGET_BUILD_APPS)$(filter cts,$(MAKECMDGOALS)),) # DO NOT USE # DO NOT USE # # This architecture / CPU variant must NOT be used for any 64 bit # platform builds. It is the lowest common denominator required -# to build an unbundled application for all supported 32 and 64 bit +# to build an unbundled application or cts for all supported 32 and 64 bit # platforms. # # If you're building a 64 bit platform (and not an application) the @@ -76,10 +76,9 @@ BUILD_EMULATOR_OPENGL := true USE_OPENGL_RENDERER := true TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 845427200 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 943718400 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_FLASH_BLOCK_SIZE := 512 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true - diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index 736ad7f..ff5a4e4 100644 --- a/target/board/generic_mips/BoardConfig.mk +++ b/target/board/generic_mips/BoardConfig.mk @@ -53,7 +53,7 @@ BUILD_EMULATOR_OPENGL := true USE_OPENGL_RENDERER := true TARGET_USERIMAGES_USE_EXT4 := true -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 786432000 +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 838860800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index c4fd958..295ee2b 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 := 943718400 # 900MB +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824 # 1GB BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 |