diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-28 18:02:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 18:02:24 +0000 |
| commit | f9ff246dd7d4d44ad65d7f9690780eddaf74bde0 (patch) | |
| tree | 6cb20831d067c82e5ede27490fe9ac257906528d /include | |
| parent | accd09581eae7a7d3c746a4d9a7415c9a131d59e (diff) | |
| parent | 4f3ad823eaf97fcbcbb1afac67371aff76677b1d (diff) | |
| download | system_core-f9ff246dd7d4d44ad65d7f9690780eddaf74bde0.zip system_core-f9ff246dd7d4d44ad65d7f9690780eddaf74bde0.tar.gz system_core-f9ff246dd7d4d44ad65d7f9690780eddaf74bde0.tar.bz2 | |
am 4f3ad823: am a8329a36: am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit '4f3ad823eaf97fcbcbb1afac67371aff76677b1d':
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 baa012d..61ce211 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" }, |