diff options
| author | Brian Swetland <swetland@google.com> | 2010-09-19 04:35:19 -0700 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2010-09-19 04:35:19 -0700 |
| commit | d06df51bcd7bcc2656089a529fa6a455bad00d37 (patch) | |
| tree | 66f3896bd96c96669c9b2914186cd5d67cf9de8e /include/private | |
| parent | 1f7bc6d1a94d36547a7f5bbd5e039fffc37e9629 (diff) | |
| parent | 3b5214a67f43e2e4f69428e98d3a2c130c7c87d8 (diff) | |
| download | system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.zip system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.tar.gz system_core-d06df51bcd7bcc2656089a529fa6a455bad00d37.tar.bz2 | |
resolved conflicts for merge of 3b5214a6 to master
Change-Id: Id73c53c6c2e9c21eb9b1d1e624aaeb25097ea7a4
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/android_filesystem_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index 2a60475..2cbe767 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -142,6 +142,7 @@ static struct fs_path_config android_dirs[] = { { 00771, AID_SYSTEM, AID_SYSTEM, "data" }, { 00750, AID_ROOT, AID_SHELL, "sbin" }, { 00755, AID_ROOT, AID_SHELL, "system/bin" }, + { 00755, AID_ROOT, AID_SHELL, "system/vendor" }, { 00755, AID_ROOT, AID_SHELL, "system/xbin" }, { 00755, AID_ROOT, AID_ROOT, "system/etc/ppp" }, { 00777, AID_ROOT, AID_ROOT, "sdcard" }, @@ -191,6 +192,7 @@ static struct fs_path_config android_files[] = { { 06750, AID_ROOT, AID_SHELL, "system/bin/run-as" }, { 00755, AID_ROOT, AID_SHELL, "system/bin/*" }, { 00755, AID_ROOT, AID_SHELL, "system/xbin/*" }, + { 00755, AID_ROOT, AID_SHELL, "system/vendor/bin/*" }, { 00750, AID_ROOT, AID_SHELL, "sbin/*" }, { 00755, AID_ROOT, AID_ROOT, "bin/*" }, { 00750, AID_ROOT, AID_SHELL, "init*" }, |