summaryrefslogtreecommitdiffstats
path: root/include/private
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-01-15 20:51:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-15 20:51:35 +0000
commit2901b30a58a6a7f708bb3e5df8b483cf8035c740 (patch)
tree8b12b50249000ae47c256484ba9e8e2d7f3bad1c /include/private
parenta2c6f6cdcfb3f7ecc93a99700104f3d12c59c571 (diff)
parent70f6dea9d06876bc65181c40ee9e623be196fb4c (diff)
downloadsystem_core-2901b30a58a6a7f708bb3e5df8b483cf8035c740.zip
system_core-2901b30a58a6a7f708bb3e5df8b483cf8035c740.tar.gz
system_core-2901b30a58a6a7f708bb3e5df8b483cf8035c740.tar.bz2
am 70f6dea9: Merge "android_filesystem: Remove setuid bits from tcpdump" into lmp-mr1-dev
* commit '70f6dea9d06876bc65181c40ee9e623be196fb4c': android_filesystem: Remove setuid bits from tcpdump
Diffstat (limited to 'include/private')
-rw-r--r--include/private/android_filesystem_config.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 5efe2e1..101cacd 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -252,7 +252,6 @@ static const struct fs_path_config android_files[] = {
{ 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/librank" },
{ 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/procrank" },
{ 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/procmem" },
- { 06755, AID_ROOT, AID_ROOT, 0, "system/xbin/tcpdump" },
{ 04770, AID_ROOT, AID_RADIO, 0, "system/bin/pppd-ril" },
/* the following files have enhanced capabilities and ARE included in user builds. */