diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-28 10:20:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 10:20:55 +0000 |
| commit | 4f3ad823eaf97fcbcbb1afac67371aff76677b1d (patch) | |
| tree | 4de0ba139460c38d0a85a1214eae419b1a657eab /include | |
| parent | 73334e60530ac68c8b4686316924c225fd037a84 (diff) | |
| parent | a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9 (diff) | |
| download | system_core-4f3ad823eaf97fcbcbb1afac67371aff76677b1d.zip system_core-4f3ad823eaf97fcbcbb1afac67371aff76677b1d.tar.gz system_core-4f3ad823eaf97fcbcbb1afac67371aff76677b1d.tar.bz2 | |
am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit 'a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9':
Add UID and directory for RELRO sharing support.
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/android_filesystem_config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index d662107..f5289c1 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h @@ -77,6 +77,7 @@ #define AID_SDCARD_AV 1034 /* external storage audio/video access */ #define AID_SDCARD_ALL 1035 /* access all users external storage */ #define AID_LOGD 1036 /* log daemon */ +#define AID_SHARED_RELRO 1037 /* creator of shared GNU RELRO files */ #define AID_SHELL 2000 /* adb and debug shell user */ #define AID_CACHE 2001 /* cache access */ @@ -153,6 +154,7 @@ static const struct android_id_info android_ids[] = { { "sdcard_av", AID_SDCARD_AV, }, { "sdcard_all", AID_SDCARD_ALL, }, { "logd", AID_LOGD, }, + { "shared_relro", AID_SHARED_RELRO, }, { "shell", AID_SHELL, }, { "cache", AID_CACHE, }, @@ -198,6 +200,7 @@ static const struct fs_path_config android_dirs[] = { { 00771, AID_SHELL, AID_SHELL, 0, "data/local" }, { 01771, AID_SYSTEM, AID_MISC, 0, "data/misc" }, { 00770, AID_DHCP, AID_DHCP, 0, "data/misc/dhcp" }, + { 00771, AID_SHARED_RELRO, AID_SHARED_RELRO, 0, "data/misc/shared_relro" }, { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media" }, { 00775, AID_MEDIA_RW, AID_MEDIA_RW, 0, "data/media/Music" }, { 00771, AID_SYSTEM, AID_SYSTEM, 0, "data" }, |