Merge "cf: Move vendor sepolicy to match pixel sepolicy folder layout" into master-cuttlefish-testing am: 16993dac12 Change-Id: I00348cf743108a1b40921a76b9f25f1c725f6fc7

commit: 2cf898da3f53d01a61fab556c3df48f04180bdf9 [log] [tgz]
author: Ram Muthiah <rammuthiah@google.com> Wed Apr 24 21:16:41 2019 -0700
committer: android-build-merger <android-build-merger@google.com> Wed Apr 24 21:16:41 2019 -0700
tree: b0e432b9813129ce9dd609f131d62e1b44b7d57d
parent: 4b231ac6de57771d5ac6351d6a8d8fb8d424c686 [diff]
parent: 16993dac12ba7033541ee5a7a9fd2552cd644d93 [diff]
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 0922f3e..2d06a80 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk

@@ -96,7 +96,7 @@
 WIFI_DRIVER_FW_PATH_STA     := "/dev/null"
 WIFI_DRIVER_FW_PATH_AP      := "/dev/null"
 
-BOARD_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy
+BOARD_SEPOLICY_DIRS += device/google/cuttlefish/shared/sepolicy/vendor
 
 # master has breaking changes in dlfcn.h, but the platform SDK hasn't been
 # bumped. Restore the line below when it is.

diff --git a/shared/sepolicy/adbd.te b/shared/sepolicy/vendor/adbd.te
similarity index 100%
rename from shared/sepolicy/adbd.te
rename to shared/sepolicy/vendor/adbd.te


diff --git a/shared/sepolicy/bootanim.te b/shared/sepolicy/vendor/bootanim.te
similarity index 100%
rename from shared/sepolicy/bootanim.te
rename to shared/sepolicy/vendor/bootanim.te


diff --git a/shared/sepolicy/bug_map b/shared/sepolicy/vendor/bug_map
similarity index 100%
rename from shared/sepolicy/bug_map
rename to shared/sepolicy/vendor/bug_map


diff --git a/shared/sepolicy/cameraserver.te b/shared/sepolicy/vendor/cameraserver.te
similarity index 100%
rename from shared/sepolicy/cameraserver.te
rename to shared/sepolicy/vendor/cameraserver.te


diff --git a/shared/sepolicy/device.te b/shared/sepolicy/vendor/device.te
similarity index 100%
rename from shared/sepolicy/device.te
rename to shared/sepolicy/vendor/device.te


diff --git a/shared/sepolicy/file.te b/shared/sepolicy/vendor/file.te
similarity index 100%
rename from shared/sepolicy/file.te
rename to shared/sepolicy/vendor/file.te


diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/vendor/file_contexts
similarity index 100%
rename from shared/sepolicy/file_contexts
rename to shared/sepolicy/vendor/file_contexts


diff --git a/shared/sepolicy/gceservice.te b/shared/sepolicy/vendor/gceservice.te
similarity index 100%
rename from shared/sepolicy/gceservice.te
rename to shared/sepolicy/vendor/gceservice.te


diff --git a/shared/sepolicy/genfs_contexts b/shared/sepolicy/vendor/genfs_contexts
similarity index 100%
rename from shared/sepolicy/genfs_contexts
rename to shared/sepolicy/vendor/genfs_contexts


diff --git a/shared/sepolicy/hal_bluetooth_sim.te b/shared/sepolicy/vendor/hal_bluetooth_sim.te
similarity index 100%
rename from shared/sepolicy/hal_bluetooth_sim.te
rename to shared/sepolicy/vendor/hal_bluetooth_sim.te


diff --git a/shared/sepolicy/hal_camera_default.te b/shared/sepolicy/vendor/hal_camera_default.te
similarity index 100%
rename from shared/sepolicy/hal_camera_default.te
rename to shared/sepolicy/vendor/hal_camera_default.te


diff --git a/shared/sepolicy/hal_drm_default.te b/shared/sepolicy/vendor/hal_drm_default.te
similarity index 100%
rename from shared/sepolicy/hal_drm_default.te
rename to shared/sepolicy/vendor/hal_drm_default.te


diff --git a/shared/sepolicy/hal_dumpstate_impl.te b/shared/sepolicy/vendor/hal_dumpstate_impl.te
similarity index 100%
rename from shared/sepolicy/hal_dumpstate_impl.te
rename to shared/sepolicy/vendor/hal_dumpstate_impl.te


diff --git a/shared/sepolicy/hal_gnss_default.te b/shared/sepolicy/vendor/hal_gnss_default.te
similarity index 100%
rename from shared/sepolicy/hal_gnss_default.te
rename to shared/sepolicy/vendor/hal_gnss_default.te


diff --git a/shared/sepolicy/hal_graphics_allocator.te b/shared/sepolicy/vendor/hal_graphics_allocator.te
similarity index 100%
rename from shared/sepolicy/hal_graphics_allocator.te
rename to shared/sepolicy/vendor/hal_graphics_allocator.te


diff --git a/shared/sepolicy/hal_graphics_allocator_default.te b/shared/sepolicy/vendor/hal_graphics_allocator_default.te
similarity index 100%
rename from shared/sepolicy/hal_graphics_allocator_default.te
rename to shared/sepolicy/vendor/hal_graphics_allocator_default.te


diff --git a/shared/sepolicy/hal_graphics_composer.te b/shared/sepolicy/vendor/hal_graphics_composer.te
similarity index 100%
rename from shared/sepolicy/hal_graphics_composer.te
rename to shared/sepolicy/vendor/hal_graphics_composer.te


diff --git a/shared/sepolicy/hal_graphics_composer_default.te b/shared/sepolicy/vendor/hal_graphics_composer_default.te
similarity index 100%
rename from shared/sepolicy/hal_graphics_composer_default.te
rename to shared/sepolicy/vendor/hal_graphics_composer_default.te


diff --git a/shared/sepolicy/hal_neuralnetworks_sample.te b/shared/sepolicy/vendor/hal_neuralnetworks_sample.te
similarity index 100%
rename from shared/sepolicy/hal_neuralnetworks_sample.te
rename to shared/sepolicy/vendor/hal_neuralnetworks_sample.te


diff --git a/shared/sepolicy/hal_sensors.te b/shared/sepolicy/vendor/hal_sensors.te
similarity index 100%
rename from shared/sepolicy/hal_sensors.te
rename to shared/sepolicy/vendor/hal_sensors.te


diff --git a/shared/sepolicy/init.te b/shared/sepolicy/vendor/init.te
similarity index 100%
rename from shared/sepolicy/init.te
rename to shared/sepolicy/vendor/init.te


diff --git a/shared/sepolicy/ip_link_add.te b/shared/sepolicy/vendor/ip_link_add.te
similarity index 100%
rename from shared/sepolicy/ip_link_add.te
rename to shared/sepolicy/vendor/ip_link_add.te


diff --git a/shared/sepolicy/kernel.te b/shared/sepolicy/vendor/kernel.te
similarity index 100%
rename from shared/sepolicy/kernel.te
rename to shared/sepolicy/vendor/kernel.te


diff --git a/shared/sepolicy/libcuttlefish_rild.te b/shared/sepolicy/vendor/libcuttlefish_rild.te
similarity index 100%
rename from shared/sepolicy/libcuttlefish_rild.te
rename to shared/sepolicy/vendor/libcuttlefish_rild.te


diff --git a/shared/sepolicy/logpersist.te b/shared/sepolicy/vendor/logpersist.te
similarity index 100%
rename from shared/sepolicy/logpersist.te
rename to shared/sepolicy/vendor/logpersist.te


diff --git a/shared/sepolicy/mediacodec.te b/shared/sepolicy/vendor/mediacodec.te
similarity index 100%
rename from shared/sepolicy/mediacodec.te
rename to shared/sepolicy/vendor/mediacodec.te


diff --git a/shared/sepolicy/netd.te b/shared/sepolicy/vendor/netd.te
similarity index 100%
rename from shared/sepolicy/netd.te
rename to shared/sepolicy/vendor/netd.te


diff --git a/shared/sepolicy/property_contexts b/shared/sepolicy/vendor/property_contexts
similarity index 100%
rename from shared/sepolicy/property_contexts
rename to shared/sepolicy/vendor/property_contexts


diff --git a/shared/sepolicy/recovery.te b/shared/sepolicy/vendor/recovery.te
similarity index 100%
rename from shared/sepolicy/recovery.te
rename to shared/sepolicy/vendor/recovery.te


diff --git a/shared/sepolicy/rename_netiface.te b/shared/sepolicy/vendor/rename_netiface.te
similarity index 100%
rename from shared/sepolicy/rename_netiface.te
rename to shared/sepolicy/vendor/rename_netiface.te


diff --git a/shared/sepolicy/seapp_contexts b/shared/sepolicy/vendor/seapp_contexts
similarity index 100%
rename from shared/sepolicy/seapp_contexts
rename to shared/sepolicy/vendor/seapp_contexts


diff --git a/shared/sepolicy/service.te b/shared/sepolicy/vendor/service.te
similarity index 100%
rename from shared/sepolicy/service.te
rename to shared/sepolicy/vendor/service.te


diff --git a/shared/sepolicy/service_contexts b/shared/sepolicy/vendor/service_contexts
similarity index 100%
rename from shared/sepolicy/service_contexts
rename to shared/sepolicy/vendor/service_contexts


diff --git a/shared/sepolicy/setup_wifi.te b/shared/sepolicy/vendor/setup_wifi.te
similarity index 100%
rename from shared/sepolicy/setup_wifi.te
rename to shared/sepolicy/vendor/setup_wifi.te


diff --git a/shared/sepolicy/shell.te b/shared/sepolicy/vendor/shell.te
similarity index 100%
rename from shared/sepolicy/shell.te
rename to shared/sepolicy/vendor/shell.te


diff --git a/shared/sepolicy/socket_forward_proxy.te b/shared/sepolicy/vendor/socket_forward_proxy.te
similarity index 100%
rename from shared/sepolicy/socket_forward_proxy.te
rename to shared/sepolicy/vendor/socket_forward_proxy.te


diff --git a/shared/sepolicy/socket_vsock_proxy.te b/shared/sepolicy/vendor/socket_vsock_proxy.te
similarity index 100%
rename from shared/sepolicy/socket_vsock_proxy.te
rename to shared/sepolicy/vendor/socket_vsock_proxy.te


diff --git a/shared/sepolicy/surfaceflinger.te b/shared/sepolicy/vendor/surfaceflinger.te
similarity index 100%
rename from shared/sepolicy/surfaceflinger.te
rename to shared/sepolicy/vendor/surfaceflinger.te


diff --git a/shared/sepolicy/system_server.te b/shared/sepolicy/vendor/system_server.te
similarity index 100%
rename from shared/sepolicy/system_server.te
rename to shared/sepolicy/vendor/system_server.te


diff --git a/shared/sepolicy/ueventd.te b/shared/sepolicy/vendor/ueventd.te
similarity index 100%
rename from shared/sepolicy/ueventd.te
rename to shared/sepolicy/vendor/ueventd.te


diff --git a/shared/sepolicy/usbforward.te b/shared/sepolicy/vendor/usbforward.te
similarity index 100%
rename from shared/sepolicy/usbforward.te
rename to shared/sepolicy/vendor/usbforward.te


diff --git a/shared/sepolicy/vendor_init.te b/shared/sepolicy/vendor/vendor_init.te
similarity index 100%
rename from shared/sepolicy/vendor_init.te
rename to shared/sepolicy/vendor/vendor_init.te


diff --git a/shared/sepolicy/vport_trigger.te b/shared/sepolicy/vendor/vport_trigger.te
similarity index 100%
rename from shared/sepolicy/vport_trigger.te
rename to shared/sepolicy/vendor/vport_trigger.te


diff --git a/shared/sepolicy/vsoc_guest_region_e2e_test.te b/shared/sepolicy/vendor/vsoc_guest_region_e2e_test.te
similarity index 100%
rename from shared/sepolicy/vsoc_guest_region_e2e_test.te
rename to shared/sepolicy/vendor/vsoc_guest_region_e2e_test.te


diff --git a/shared/sepolicy/vsoc_input_service.te b/shared/sepolicy/vendor/vsoc_input_service.te
similarity index 100%
rename from shared/sepolicy/vsoc_input_service.te
rename to shared/sepolicy/vendor/vsoc_input_service.te


diff --git a/shared/sepolicy/vsock_logcat.te b/shared/sepolicy/vendor/vsock_logcat.te
similarity index 100%
rename from shared/sepolicy/vsock_logcat.te
rename to shared/sepolicy/vendor/vsock_logcat.te


diff --git a/shared/sepolicy/zygote.te b/shared/sepolicy/vendor/zygote.te
similarity index 100%
rename from shared/sepolicy/zygote.te
rename to shared/sepolicy/vendor/zygote.te
commit	2cf898da3f53d01a61fab556c3df48f04180bdf9	[log] [tgz]
author	Ram Muthiah <rammuthiah@google.com>	Wed Apr 24 21:16:41 2019 -0700
committer	android-build-merger <android-build-merger@google.com>	Wed Apr 24 21:16:41 2019 -0700
tree	b0e432b9813129ce9dd609f131d62e1b44b7d57d
parent	4b231ac6de57771d5ac6351d6a8d8fb8d424c686 [diff]
parent	16993dac12ba7033541ee5a7a9fd2552cd644d93 [diff]