| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 1 | From 363cac7dd03a359471d7aa97d7f5d8a8bcba5e11 Mon Sep 17 00:00:00 2001 |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Tue, 27 Mar 2018 23:26:49 +0200 |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 4 | Subject: [PATCH 1/2] Revert "Remove root folder bt_firmware in GSI" |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 5 | |
| 6 | This reverts commit 292b8433cb48ef4ceb2330e57e11b8f644d9d1ee. |
| 7 | |
| 8 | Essential 8.1 firmware requires this |
| 9 | --- |
| 10 | target/board/generic_arm64_ab/BoardConfig.mk | 2 +- |
| 11 | target/board/generic_arm64_ab/sepolicy/file.te | 1 + |
| 12 | target/board/generic_arm64_ab/sepolicy/file_contexts | 1 + |
| 13 | 3 files changed, 3 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 16 | index fc6b58284b..820019676a 100644 |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 17 | --- a/target/board/generic_arm64_ab/BoardConfig.mk |
| 18 | +++ b/target/board/generic_arm64_ab/BoardConfig.mk |
| 19 | @@ -33,7 +33,7 @@ TARGET_NO_RECOVERY := true |
| 20 | BOARD_BUILD_SYSTEM_ROOT_IMAGE := true |
| 21 | |
| 22 | # TODO(jiyong) These might be SoC specific. |
| 23 | -BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist |
| 24 | +BOARD_ROOT_EXTRA_FOLDERS += bt_firmware firmware firmware/radio persist |
| 25 | BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp |
| 26 | |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 27 | # Set this to create /cache mount point for non-A/B devices that mounts /cache. |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 28 | diff --git a/target/board/generic_arm64_ab/sepolicy/file.te b/target/board/generic_arm64_ab/sepolicy/file.te |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 29 | index 7adfdfa4e6..46455339a0 100644 |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 30 | --- a/target/board/generic_arm64_ab/sepolicy/file.te |
| 31 | +++ b/target/board/generic_arm64_ab/sepolicy/file.te |
| 32 | @@ -1,5 +1,6 @@ |
| 33 | # TODO(b/36764215): remove this file when the generic system image |
| 34 | # no longer has these directories |
| 35 | +type bt_firmware_file, file_type; |
| 36 | type persist_file, file_type; |
| 37 | |
| 38 | # Default type for anything under /firmware. |
| 39 | diff --git a/target/board/generic_arm64_ab/sepolicy/file_contexts b/target/board/generic_arm64_ab/sepolicy/file_contexts |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 40 | index 0a80559e17..92a4ff8726 100644 |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 41 | --- a/target/board/generic_arm64_ab/sepolicy/file_contexts |
| 42 | +++ b/target/board/generic_arm64_ab/sepolicy/file_contexts |
| 43 | @@ -2,6 +2,7 @@ |
| 44 | # no longer has these directories. They are specific to QCOM. |
| 45 | |
| 46 | # / |
| 47 | +/bt_firmware(/.*)? u:object_r:bt_firmware_file:s0 |
| 48 | /tombstones u:object_r:rootfs:s0 |
| 49 | /dsp u:object_r:rootfs:s0 |
| 50 | |
| 51 | -- |
| Jon West | 1fd6030 | 2018-08-11 19:14:03 -0400 | [diff] [blame^] | 52 | 2.17.1 |
| Pierre-Hugues Husson | 2acef1d | 2018-04-05 20:10:30 +0200 | [diff] [blame] | 53 | |