Add binaries for adb over vsock.
Bug: 121166534
Change-Id: Id1c71c00b97fdc02291204bdea717b8a04eb2304
Test: adb bugreport on launch_cvd -kernel=...cf-4.14... -vsock_guest_cid=3 -adb_mode=vsock_tunnel
(cherry picked from commit 9e86ca19b293feb6fc15fcb1eab9a09f77ddc94f)
diff --git a/host_package.mk b/host_package.mk
index d744524..cb151cd 100644
--- a/host_package.mk
+++ b/host_package.mk
@@ -26,6 +26,7 @@
host_region_e2e_test \
launch_cvd \
socket_forward_proxy \
+ socket_vsock_proxy \
adb_connector \
stop_cvd \
stream_audio \
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index f3e6826..32c7143 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -85,6 +85,7 @@
mkdir /data/vendor/wifi/wpa 0770 wifi wifi
mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi
start socket_forward_proxy
+ start socket_vsock_proxy
on property:ro.boot.vsoc_e2e_test=1
@@ -127,6 +128,8 @@
service socket_forward_proxy /vendor/bin/socket_forward_proxy
+service socket_vsock_proxy /vendor/bin/socket_vsock_proxy -guest_port=5555
+
service vport_trigger /vendor/bin/vport_trigger
oneshot
diff --git a/shared/device.mk b/shared/device.mk
index abe90b2..8a3ea33 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -66,6 +66,7 @@
dhcpcd_wlan0 \
gce_fs_monitor \
socket_forward_proxy \
+ socket_vsock_proxy \
usbforward \
VSoCService \
wpa_supplicant.vsoc.conf \
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index 1366321..13251bc 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -24,6 +24,7 @@
/vendor/bin/gce_fs_monitor u:object_r:gce_fs_monitor_exec:s0
/vendor/bin/usbforward u:object_r:usbforward_exec:s0
/vendor/bin/socket_forward_proxy u:object_r:socket_forward_proxy_exec:s0
+/vendor/bin/socket_vsock_proxy u:object_r:socket_vsock_proxy_exec:s0
/vendor/bin/vsoc_input_service u:object_r:vsoc_input_service_exec:s0
/vendor/bin/vsoc_guest_region_e2e_test u:object_r:vsoc_guest_region_e2e_test_exec:s0
/vendor/bin/vport_trigger u:object_r:vport_trigger_exec:s0
diff --git a/shared/sepolicy/socket_vsock_proxy.te b/shared/sepolicy/socket_vsock_proxy.te
new file mode 100644
index 0000000..468ac8a
--- /dev/null
+++ b/shared/sepolicy/socket_vsock_proxy.te
@@ -0,0 +1,5 @@
+type socket_vsock_proxy, domain;
+type socket_vsock_proxy_exec, exec_type, vendor_file_type, file_type;
+
+init_daemon_domain(socket_vsock_proxy)
+
