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

Commit 981a41ed authored by SzuWei Lin's avatar SzuWei Lin Committed by android-build-merger
Browse files

Merge "Remove root folder bt_firmware in GSI" into oc-mr1-dev 

am: 4ee9bb6c

Change-Id: I668f32c255004ed205634f5c91d7ca3473f1e582
parents 980eb21f 4ee9bb6c

target/board/generic_arm64_ab/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,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 += 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/generic_arm64_ab/sepolicy/file.te

+0 −1
Original line number Diff line number Diff line 
# TODO(b/36764215): remove this file when the generic system image

# no longer has these directories

type bt_firmware_file, file_type;

type persist_file, file_type;



# Default type for anything under /firmware.

target/board/generic_arm64_ab/sepolicy/file_contexts

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# no longer has these directories. They are specific to QCOM.



# /

/bt_firmware(/.*)?      u:object_r:bt_firmware_file:s0

/tombstones             u:object_r:rootfs:s0

/dsp                    u:object_r:rootfs:s0