commit e35da3771a1882447c7131b45e90a45173e7c9bd
author Jiyong Park <jiyong@google.com> Tue Mar 28 10:00:35 2017 +0900
committer Jiyong Park <jiyong@google.com> Tue Mar 28 10:02:47 2017 +0900
tree 11c04329792b145ce116b59725dd94d7b68d644b
parent 85dcd3556ffde82c3f579fe82ad0b67f194e6f35

update the location of cnss-daemon in android_filesystem_config.h

cnss-daemon is now at /vendor/bin

Bug: 36658097
Test: none

Change-Id: Idf86783f6a01fd3f4cf0c78cb3321902ee78e3de

marlin/android_filesystem_config.h

diff --git a/marlin/android_filesystem_config.h b/marlin/android_filesystem_config.h
index d4b1e34..4c45212 100644
--- a/marlin/android_filesystem_config.h
+++ b/marlin/android_filesystem_config.h
@@ -36,7 +36,7 @@
     { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
     { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/imsdatadaemon" },
     { 00755, AID_SYSTEM,    AID_RADIO,     (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
-    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"},
+    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/cnss-daemon"},
 #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
     { 00000, AID_ROOT,      AID_ROOT,      0, "system/etc/fs_config_dirs" },
 #endif

sailfish/android_filesystem_config.h

diff --git a/sailfish/android_filesystem_config.h b/sailfish/android_filesystem_config.h
index d4b1e34..4c45212 100644
--- a/sailfish/android_filesystem_config.h
+++ b/sailfish/android_filesystem_config.h
@@ -36,7 +36,7 @@
     { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/pm-service" },
     { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/imsdatadaemon" },
     { 00755, AID_SYSTEM,    AID_RADIO,     (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/ims_rtp_daemon" },
-    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"},
+    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "vendor/bin/cnss-daemon"},
 #ifdef NO_ANDROID_FILESYSTEM_CONFIG_DEVICE_DIRS
     { 00000, AID_ROOT,      AID_ROOT,      0, "system/etc/fs_config_dirs" },
 #endif