diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-28 10:17:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 10:17:44 +0000 |
| commit | a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9 (patch) | |
| tree | fd9e3a0527c8e8d9aae2b0b37bde21fdb2ba0500 | |
| parent | 1e4cfe0636f5ade52e8aabac90166b7040e60d8e (diff) | |
| parent | 96109cf36c3dd44e9ecfe4b810e21e77eaf834dc (diff) | |
| download | system_core-a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9.zip system_core-a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9.tar.gz system_core-a8329a36ca0e5f5799ec2dd14ae360dc0656b9c9.tar.bz2 | |
am 96109cf3: Merge "Add UID and directory for RELRO sharing support."
* commit '96109cf36c3dd44e9ecfe4b810e21e77eaf834dc':
Add UID and directory for RELRO sharing support.
| -rw-r--r-- | include/private/android_filesystem_config.h | 3 | ||||
| -rw-r--r-- | rootdir/init.rc | 1 |
2 files changed, 4 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" }, diff --git a/rootdir/init.rc b/rootdir/init.rc index fc57462..a9f7bcf 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -232,6 +232,7 @@ on post-fs-data mkdir /data/misc/sms 0770 system radio mkdir /data/misc/zoneinfo 0775 system system mkdir /data/misc/vpn 0770 system vpn + mkdir /data/misc/shared_relro 0771 shared_relro shared_relro mkdir /data/misc/systemkeys 0700 system system mkdir /data/misc/wifi 0770 wifi wifi mkdir /data/misc/wifi/sockets 0770 wifi wifi |