Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f5e66c2 authored Aug 21, 2017 by Bowgo Tsai Committed by android-build-merger Aug 21, 2017

Merge "GSI: adds /odm mount point in root dir" into oc-mr1-dev

am: 76097d33

Change-Id: I9316c9cdacafb85920cb7a1ceff64c3cff27e37f

parents 2e2f6f2b 76097d33

target/board/generic_arm64_ab/BoardConfig.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

target/board/treble_common.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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