commit eceee125d4966f9d5e3af0be646aa534eb4e4d01
author Dan Cashman <dcashman@google.com> Mon Oct 09 23:54:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 09 23:54:33 2017 +0000
tree 0a44977a209e4510d05b8c52b861143e8bbe5b34
parent 7a0ed9bca82c92c11631f62f3b929cd492bd6403
parent 33edd89696f0be495e4336304e35773974771803

Merge "Remove reboot_data_file." am: f3f194c09a am: 9cac761df7 am: 17491f6b9c
am: 33edd89696

Change-Id: Iba4aba8833f3543d8e28c5d469667bbeb09b860e

private/compat/26.0/26.0.cil

diff --git a/private/compat/26.0/26.0.cil b/private/compat/26.0/26.0.cil
index 820507c..721d27e 100644
--- a/private/compat/26.0/26.0.cil
+++ b/private/compat/26.0/26.0.cil
@@ -7,6 +7,7 @@
 (type asan_reboot_prop)
 (type log_device)
 (type mediacasserver_service)
+(type reboot_data_file)
 (type tracing_shell_writable)
 (type tracing_shell_writable_debug)
 (type vold_socket)

public/file.te

diff --git a/public/file.te b/public/file.te
index f978edc..8dbfd3b 100644
--- a/public/file.te
+++ b/public/file.te
@@ -208,7 +208,6 @@
 type net_data_file, file_type, data_file_type, core_data_file_type;
 type nfc_data_file, file_type, data_file_type, core_data_file_type;
 type radio_data_file, file_type, data_file_type, core_data_file_type, mlstrustedobject;
-type reboot_data_file, file_type, data_file_type, core_data_file_type;
 type recovery_data_file, file_type, data_file_type, core_data_file_type;
 type shared_relro_file, file_type, data_file_type, core_data_file_type;
 type systemkeys_data_file, file_type, data_file_type, core_data_file_type;