From 882c99a33b48de355c168a1360912d13e7516dc1 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Fri, 18 Aug 2017 16:08:36 +0800 Subject: [PATCH] GSI: adds /odm mount point in root dir Bug: 64700195 Test: boot A/B device with /odm Change-Id: Ie014a052a333b2cb8d89bc43e4326be81e638dcd --- target/board/generic_arm64_ab/BoardConfig.mk | 2 +- target/board/treble_common.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index 56cc2da7d..1cab84474 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -34,7 +34,7 @@ TARGET_NO_RECOVERY := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # TODO(jiyong) These might be SoC specific. -BOARD_ROOT_EXTRA_FOLDERS := bt_firmware firmware firmware/radio persist +BOARD_ROOT_EXTRA_FOLDERS += bt_firmware firmware firmware/radio persist BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp # TODO(b/36764215): remove this setting when the generic system image diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk index f7c8b32cc..8637235a0 100644 --- a/target/board/treble_common.mk +++ b/target/board/treble_common.mk @@ -56,3 +56,8 @@ NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 # TODO(b/35790399): remove when b/35790399 is fixed. BOARD_NAND_SPARE_SIZE := 0 BOARD_FLASH_BLOCK_SIZE := 512 + +# b/64700195: add minimum support for odm.img +# Currently odm.img can only be built by `make custom_images`. +# Adding /odm mount point under root directory. +BOARD_ROOT_EXTRA_FOLDERS += odm