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

am: 4ee9bb6caa

Change-Id: I668f32c255004ed205634f5c91d7ca3473f1e582
This commit is contained in:
SzuWei Lin 2017-09-07 15:08:07 +00:00 committed by android-build-merger
commit 981a41ed2b
3 changed files with 1 additions and 3 deletions

View file

@ -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

View file

@ -1,6 +1,5 @@
# 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.

View file

@ -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