summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2018-01-16 23:36:16 -0800
committerJeff Vander Stoep <jeffv@google.com>2018-01-16 23:36:16 -0800
commitef44fea5846fa8c70d4b7f604e7234d2dfcceeac (patch)
tree06602b93e802be6a237a46d3f7a5799439f943d2
parentbe829f4801e3bb7125942f4d96dcfe02d0606d7d (diff)
downloaddragon-ef44fea5846fa8c70d4b7f604e7234d2dfcceeac.tar.gz
Fix build breakageandroid-wear-8.0.0_r1
Correctly annotate files to pass build tests. Test: aosp_dragon-userdebug builds Change-Id: Ief72183bc56dc9e63e8928cb800ac8dedd74b310
-rw-r--r--sepolicy/file_contexts3
-rw-r--r--sepolicy/hal_dumpstate_impl.te2
2 files changed, 1 insertions, 4 deletions
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index aae2af1..de95310 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -73,8 +73,5 @@
# logs for touch firmware update
/data/misc/touchfwup(/.*)? u:object_r:touch_fw_update_log_file:s0
-# camera overrides ISP files
-/vendor/firmware/camera(/.*)? u:object_r:camera_data_file:s0
-
#sysfs nodes for cpuinfo for CTS
/sys/firmware/devicetree/base/cpus(/.*)? u:object_r:sysfs_socinfo:s0
diff --git a/sepolicy/hal_dumpstate_impl.te b/sepolicy/hal_dumpstate_impl.te
index 61d1407..2c7060e 100644
--- a/sepolicy/hal_dumpstate_impl.te
+++ b/sepolicy/hal_dumpstate_impl.te
@@ -1,7 +1,7 @@
type hal_dumpstate_impl, domain;
hal_server_domain(hal_dumpstate_impl, hal_dumpstate)
-type hal_dumpstate_impl_exec, exec_type, file_type;
+type hal_dumpstate_impl_exec, exec_type, vendor_file_type, file_type;
init_daemon_domain(hal_dumpstate_impl)
# hal_dumstate_impl sets the debug.bq25892 property