Include bluetooth cert in mac_permissions.xml

Also, rename the file_contexts file to match the new BT stack apex name
(com.android.bluetooth)

Test: TH
Bug: 236187653
Bug: 236192423
Ignore-AOSP-First: LSC

Change-Id: Ie610775d397d0a81f83e251ed3b5f73006bfd272
This commit is contained in:
Oriol Prieto Gasco 2022-06-20 19:22:39 +00:00 committed by Oriol Prieto Gascó
parent f33d6752c1
commit 57f48ae1d2
3 changed files with 5 additions and 1 deletions

View file

@ -21,6 +21,8 @@ package {
default_applicable_licenses: ["system_sepolicy_license"],
}
// TODO(b/236681553): Remove com.android.bluetooth-file_contexts
filegroup {
name: "apex_file_contexts_files",
srcs: ["*-file_contexts"],

View file

@ -0,0 +1,2 @@
(/.*)? u:object_r:system_file:s0
/lib(64)?(/.*) u:object_r:system_lib_file:s0

View file

@ -22,7 +22,7 @@ $(plat_mac_perms_keys.tmp): $(all_plat_mac_perms_keys) $(M4)
$(hide) $(M4) --fatal-warnings -s $(PRIVATE_ADDITIONAL_M4DEFS) $(PRIVATE_KEYS) > $@
# Should be synced with keys.conf.
all_plat_keys := platform sdk_sandbox media networkstack shared testkey
all_plat_keys := platform sdk_sandbox media networkstack shared testkey bluetooth
all_plat_keys := $(all_plat_keys:%=$(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))/%.x509.pem)
$(LOCAL_BUILT_MODULE): PRIVATE_MAC_PERMS_FILES := $(all_plat_mac_perms_files)