From 292b8433cb48ef4ceb2330e57e11b8f644d9d1ee Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Tue, 5 Sep 2017 11:12:29 +0800 Subject: [PATCH] Remove root folder bt_firmware in GSI Bug: 64905218 Bug: 36764215 Test: Test on 2 different devices with GSI, and check BT Change-Id: I5fca470aece7d4b777540da21af601a7cc8dc83e --- target/board/generic_arm64_ab/BoardConfig.mk | 2 +- target/board/generic_arm64_ab/sepolicy/file.te | 1 - target/board/generic_arm64_ab/sepolicy/file_contexts | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index e69debe50..22b9f429f 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm64_ab/sepolicy/file.te b/target/board/generic_arm64_ab/sepolicy/file.te index 46455339a..7adfdfa4e 100644 --- a/target/board/generic_arm64_ab/sepolicy/file.te +++ b/target/board/generic_arm64_ab/sepolicy/file.te @@ -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. diff --git a/target/board/generic_arm64_ab/sepolicy/file_contexts b/target/board/generic_arm64_ab/sepolicy/file_contexts index 92a4ff872..0a80559e1 100644 --- a/target/board/generic_arm64_ab/sepolicy/file_contexts +++ b/target/board/generic_arm64_ab/sepolicy/file_contexts @@ -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