Merge "Revert "fs_config: Move hostapd to /vendor/bin/hw"" into pi-dev

am: 36a716dc1f

Change-Id: Id8dad48e5fe42e8671bf2ceb1fcdbc28cb087ffc
This commit is contained in:
Tom Cherry 2018-03-28 18:45:07 +00:00 committed by android-build-merger
commit 87f114d3f3

View file

@ -186,16 +186,11 @@ static const struct fs_path_config android_files[] = {
{ 00755, AID_SYSTEM, AID_GRAPHICS, CAP_MASK_LONG(CAP_SYS_NICE),
"system/bin/surfaceflinger" },
// Support hostapd administering a network interface (Old Path: <= O-MR1 release).
// Support hostapd administering a network interface.
{ 00755, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
CAP_MASK_LONG(CAP_NET_RAW),
"vendor/bin/hostapd" },
// Support hostapd administering a network interface (New Path: >= P release).
{ 00750, AID_WIFI, AID_WIFI, CAP_MASK_LONG(CAP_NET_ADMIN) |
CAP_MASK_LONG(CAP_NET_RAW),
"vendor/bin/hw/hostapd" },
// Support Bluetooth legacy hal accessing /sys/class/rfkill
// Support RT scheduling in Bluetooth
{ 00700, AID_BLUETOOTH, AID_BLUETOOTH, CAP_MASK_LONG(CAP_NET_ADMIN) |