Remove gcelogwrapper
Change-Id: Ie183eb6aeb8e44aa4536d1aa4a90531d06a693ca
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index 58ba623..f407733 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -84,18 +84,11 @@
seclabel u:r:su:s0
oneshot
-service remoter /system/bin/gcelogwrapper /system/bin/remoter
+service remoter /system/bin/remoter
seclabel u:r:su:s0
oneshot
-service vnc_server /system/bin/gcelogwrapper /system/bin/vnc_server
- oneshot
-
-
-service logtop3 /system/bin/gcelogwrapper /system/bin/top -m 3 -d 10
- class main
- disabled
- seclabel u:r:su:s0
+service vnc_server /system/bin/vnc_server
oneshot
@@ -113,7 +106,7 @@
oneshot
-service gce_fs_monitor /system/bin/gcelogwrapper -k /system/bin/gce_fs_monitor
+service gce_fs_monitor /system/bin/gce_fs_monitor
class late_start
disabled
seclabel u:r:su:s0
diff --git a/shared/device.mk b/shared/device.mk
index 8af55c3..0afc52c 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -60,7 +60,6 @@
gce_network \
gce_network.config \
gce_shutdown \
- gcelogwrapper \
GceService \
remoter \
vnc_server \
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index 6c2d0fc..fcdba50 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -1,4 +1,3 @@
-/system/bin/gcelogwrapper u:object_r:gcelogwrapper_exec:s0
/system/bin/gce_shutdown u:object_r:gce_shutdown_exec:s0
/system/bin/remoter u:object_r:remoter_exec:s0
/system/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim u:object_r:hal_bluetooth_sim_exec:s0
diff --git a/shared/sepolicy/gcelogwrapper.te b/shared/sepolicy/gcelogwrapper.te
deleted file mode 100644
index 44c5103..0000000
--- a/shared/sepolicy/gcelogwrapper.te
+++ /dev/null
@@ -1,21 +0,0 @@
-# The gcelogwrapper command run by init.
-type gcelogwrapper, domain;
-type gcelogwrapper_exec, exec_type, file_type;
-
-init_daemon_domain(gcelogwrapper)
-
-allow gcelogwrapper bluetooth_prop:property_service set;
-allow gcelogwrapper device:dir { add_name write };
-allow gcelogwrapper device:lnk_file create;
-allow gcelogwrapper devpts:chr_file { getattr ioctl open read write };
-allow gcelogwrapper gcelogwrapper_tmpfs:file { create getattr ioctl open rename setattr unlink };
-allow gcelogwrapper init:unix_stream_socket connectto;
-allow gcelogwrapper kmsg_device:chr_file { open write };
-allow gcelogwrapper port:tcp_socket { name_bind name_connect node_bind read };
-allow gcelogwrapper property_socket:sock_file write;
-allow gcelogwrapper self:capability { chown dac_override net_bind_service setgid };
-allow gcelogwrapper self:tcp_socket { bind connect create getattr getopt listen read setopt write };
-allow gcelogwrapper self:udp_socket create;
-allow gcelogwrapper shell_exec:file execute;
-allow gcelogwrapper system_file:file execute_no_trans;
-allow gcelogwrapper tmpfs:dir { add_name create remove_name setattr write };
diff --git a/shared/sepolicy/netd.te b/shared/sepolicy/netd.te
index bf329cf..a586150 100644
--- a/shared/sepolicy/netd.te
+++ b/shared/sepolicy/netd.te
@@ -1,3 +1 @@
-allow netd gcelogwrapper:fd use;
-allow netd gcelogwrapper:tcp_socket { getopt read setopt write };
allow netd self:capability sys_module;