diff options
| author | 2019-04-12 13:16:34 +0800 | |
|---|---|---|
| committer | 2019-04-12 13:16:34 +0800 | |
| commit | 90bfda1cc45643c302e80b99be3325d2e14b238c (patch) | |
| tree | 4b108eb91fed6c81c867bef2ceb703c4e6093e6c | |
| parent | 289fa3cea303fa118365330e35b7758c4f4e72bd (diff) | |
Change emulator system image to unsparse format
Currently, emulator system image is the non-legasy GSI, which is in sparse
format. Several internal clients don't support sparse format, and other
internal/external clients usually support both. The reason to choose sparse
format for GSI may not be valid any more. See bug for detail.
Bug: 130341962
Test: Checked the header of system.img to see if it's unsparse.
Boot emulator aosp_x86 successfully.
Boot mixed GSI and CF x86 successfully.
Change-Id: I839f49809429227607b2e876a4a3628df43a97b4
| -rw-r--r-- | target/board/BoardConfigEmuCommon.mk | 3 | ||||
| -rw-r--r-- | target/board/BoardConfigGsiCommon.mk | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 617b3c58f0..c871d7eab3 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -20,6 +20,9 @@ BUILD_QEMU_IMAGES := true # the GLES renderer disables itself if host GL acceleration isn't available. USE_OPENGL_RENDERER := true +# Emulator doesn't support sparse image format. +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true + # ~140 MB vendor image. Please adjust system image / vendor image sizes # when finalizing them. The partition size needs to be a multiple of image # block size: 4096. diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index d53995c03b..58cf9c67b8 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -9,11 +9,6 @@ include build/make/target/board/BoardConfigMainlineCommon.mk # This flag is set by mainline but isn't desired for GSI. BOARD_USES_SYSTEM_OTHER_ODEX := -# GSIs are historically released in sparse format. -# Some vendors' bootloaders don't work properly with raw format images. So -# we explicit specify this need below (even though it's the current default). -TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false - # system.img is always ext4 with sparse option # GSI also includes make_f2fs to support userdata parition in f2fs # for some devices |