summaryrefslogtreecommitdiff
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-11-11 10:56:31 (GMT)
committer Android Partner Code Review <android-gerrit-partner@google.com>2020-11-11 10:56:31 (GMT)
commitb29c56883ddc88264fb6a99b355c3a2d85716d10 (patch)
treea4d4ce17f5677ac13d322929e032f05bd973b738
parent65b6f522a2962ff36be64a45db0610f73d0a8ddf (diff)
parent3eadd71a065f1df06dc53c9c7455c677e2c17aa0 (diff)
downloadcommon-b29c56883ddc88264fb6a99b355c3a2d85716d10.zip
common-b29c56883ddc88264fb6a99b355c3a2d85716d10.tar.gz
common-b29c56883ddc88264fb6a99b355c3a2d85716d10.tar.bz2
Merge "Provision: install tee_key_inject [1/1]" into r-tv-dev
Diffstat
-rw-r--r--core_amlogic.mk1
-rw-r--r--sepolicy/file_contexts2
-rw-r--r--sepolicy/init.te1
-rw-r--r--sepolicy/tee.te3
-rwxr-xr-xtdk_keys/pcpk.bin1
5 files changed, 7 insertions, 1 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk
index 2c2208b..9745ac1 100644
--- a/core_amlogic.mk
+++ b/core_amlogic.mk
@@ -311,6 +311,7 @@ PRODUCT_PACKAGES += \
tee_concurrent_ta \
tee_concurrent_large_ta \
tee_provision \
+ tee_key_inject \
libprovision \
tee_provision_ta \
tee_hdcp \
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 531c1f6..3ce2c9c 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -298,7 +298,7 @@
/param(/.*)? u:object_r:param_tv_file:s0
/mnt/vendor/tee(/.*)? u:object_r:tee_vendor_file:s0
/mnt/vendor/param(/.*)? u:object_r:param_tv_file:s0
-/mnt/vendor/factory(/.*)? u:object_r:factory_vendor_file:s0
+/mnt/vendor/factory(/.*)? u:object_r:vfat:s0
/dev/usb-ffs/fastboot(/.*)? u:object_r:fastboot_aml_file:s0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index d4916fd..b678aa6 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -48,3 +48,4 @@ allow init sysfs_display:file rw_file_perms;
allow init drm_device:chr_file { setattr read write open ioctl };
allow init firmload_exec:file {getattr};
allow init param_tv_file:dir mounton;
+allow init vfat:dir mounton;
diff --git a/sepolicy/tee.te b/sepolicy/tee.te
index bccdfbc..205f4fe 100644
--- a/sepolicy/tee.te
+++ b/sepolicy/tee.te
@@ -30,3 +30,6 @@ allow tee node:tcp_socket { node_bind };
allow tee factory_vendor_file:dir r_dir_perms;
allow tee factory_vendor_file:file r_file_perms;
+
+allow tee vfat:dir rw_dir_perms;
+allow tee vfat:file rw_file_perms;
diff --git a/tdk_keys/pcpk.bin b/tdk_keys/pcpk.bin
new file mode 100755
index 0000000..767ebda
--- a/dev/null
+++ b/tdk_keys/pcpk.bin
@@ -0,0 +1 @@
+钆esmjg0 \ No newline at end of file