diff options
author | William Roberts | 2016-04-08 15:46:10 -0500 |
---|---|---|
committer | William Roberts | 2016-12-08 18:57:17 -0600 |
commit | bc56847e84816e10908d8eea599f2afff5cc139d (patch) | |
tree | cf2cef30d9929854341185bd14d8d7201839bf53 /include | |
parent | aece425166b1636de79efbddb5997ecdcea2ce03 (diff) | |
download | platform-system-core-bc56847e84816e10908d8eea599f2afff5cc139d.tar.gz platform-system-core-bc56847e84816e10908d8eea599f2afff5cc139d.tar.xz platform-system-core-bc56847e84816e10908d8eea599f2afff5cc139d.zip |
android_ids: move to bionic
Prevent others from using android_ids and force them
to use grp.h and pwd.h family of functions.
Test: Build and boot, verify services are running properly.
Bug: 27999086
Change-Id: Idcd75cf7e91a49ef07a0ed3bdb514ad61aa82e69
Signed-off-by: William Roberts <william.c.roberts@intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/private/android_filesystem_config.h | 101 |
1 files changed, 6 insertions, 95 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h index c9e1923c4..80802ccfb 100644 --- a/include/private/android_filesystem_config.h +++ b/include/private/android_filesystem_config.h | |||
@@ -140,104 +140,15 @@ | |||
140 | #define AID_SHARED_GID_START 50000 /* start of gids for apps in each user to share */ | 140 | #define AID_SHARED_GID_START 50000 /* start of gids for apps in each user to share */ |
141 | #define AID_SHARED_GID_END 59999 /* start of gids for apps in each user to share */ | 141 | #define AID_SHARED_GID_END 59999 /* start of gids for apps in each user to share */ |
142 | 142 | ||
143 | #if !defined(EXCLUDE_FS_CONFIG_STRUCTURES) | ||
144 | /* | 143 | /* |
145 | * Used in: | 144 | * android_ids has moved to pwd/grp functionality. |
146 | * bionic/libc/bionic/stubs.cpp | 145 | * If you need to add one, the structure is now |
147 | * external/libselinux/src/android.c | 146 | * auto-generated based on the AID_ constraints |
148 | * system/core/logd/LogStatistics.cpp | 147 | * documented at the top of this header file. |
149 | * system/core/init/ueventd.cpp | 148 | * Also see build/tools/fs_config for more details. |
150 | * system/core/init/util.cpp | ||
151 | */ | 149 | */ |
152 | struct android_id_info { | ||
153 | const char *name; | ||
154 | unsigned aid; | ||
155 | }; | ||
156 | |||
157 | static const struct android_id_info android_ids[] = { | ||
158 | { "root", AID_ROOT, }, | ||
159 | |||
160 | { "system", AID_SYSTEM, }, | ||
161 | |||
162 | { "radio", AID_RADIO, }, | ||
163 | { "bluetooth", AID_BLUETOOTH, }, | ||
164 | { "graphics", AID_GRAPHICS, }, | ||
165 | { "input", AID_INPUT, }, | ||
166 | { "audio", AID_AUDIO, }, | ||
167 | { "camera", AID_CAMERA, }, | ||
168 | { "log", AID_LOG, }, | ||
169 | { "compass", AID_COMPASS, }, | ||
170 | { "mount", AID_MOUNT, }, | ||
171 | { "wifi", AID_WIFI, }, | ||
172 | { "adb", AID_ADB, }, | ||
173 | { "install", AID_INSTALL, }, | ||
174 | { "media", AID_MEDIA, }, | ||
175 | { "dhcp", AID_DHCP, }, | ||
176 | { "sdcard_rw", AID_SDCARD_RW, }, | ||
177 | { "vpn", AID_VPN, }, | ||
178 | { "keystore", AID_KEYSTORE, }, | ||
179 | { "usb", AID_USB, }, | ||
180 | { "drm", AID_DRM, }, | ||
181 | { "mdnsr", AID_MDNSR, }, | ||
182 | { "gps", AID_GPS, }, | ||
183 | // AID_UNUSED1 | ||
184 | { "media_rw", AID_MEDIA_RW, }, | ||
185 | { "mtp", AID_MTP, }, | ||
186 | // AID_UNUSED2 | ||
187 | { "drmrpc", AID_DRMRPC, }, | ||
188 | { "nfc", AID_NFC, }, | ||
189 | { "sdcard_r", AID_SDCARD_R, }, | ||
190 | { "clat", AID_CLAT, }, | ||
191 | { "loop_radio", AID_LOOP_RADIO, }, | ||
192 | { "mediadrm", AID_MEDIA_DRM, }, | ||
193 | { "package_info", AID_PACKAGE_INFO, }, | ||
194 | { "sdcard_pics", AID_SDCARD_PICS, }, | ||
195 | { "sdcard_av", AID_SDCARD_AV, }, | ||
196 | { "sdcard_all", AID_SDCARD_ALL, }, | ||
197 | { "logd", AID_LOGD, }, | ||
198 | { "shared_relro", AID_SHARED_RELRO, }, | ||
199 | { "dbus", AID_DBUS, }, | ||
200 | { "tlsdate", AID_TLSDATE, }, | ||
201 | { "mediaex", AID_MEDIA_EX, }, | ||
202 | { "audioserver", AID_AUDIOSERVER, }, | ||
203 | { "metrics_coll", AID_METRICS_COLL }, | ||
204 | { "metricsd", AID_METRICSD }, | ||
205 | { "webserv", AID_WEBSERV }, | ||
206 | { "debuggerd", AID_DEBUGGERD, }, | ||
207 | { "mediacodec", AID_MEDIA_CODEC, }, | ||
208 | { "cameraserver", AID_CAMERASERVER, }, | ||
209 | { "firewall", AID_FIREWALL, }, | ||
210 | { "trunks", AID_TRUNKS, }, | ||
211 | { "nvram", AID_NVRAM, }, | ||
212 | { "dns", AID_DNS, }, | ||
213 | { "dns_tether", AID_DNS_TETHER, }, | ||
214 | { "webview_zygote", AID_WEBVIEW_ZYGOTE, }, | ||
215 | { "vehicle_network", AID_VEHICLE_NETWORK, }, | ||
216 | { "media_audio", AID_MEDIA_AUDIO, }, | ||
217 | { "media_video", AID_MEDIA_VIDEO, }, | ||
218 | { "media_image", AID_MEDIA_IMAGE, }, | ||
219 | 150 | ||
220 | { "shell", AID_SHELL, }, | 151 | #if !defined(EXCLUDE_FS_CONFIG_STRUCTURES) |
221 | { "cache", AID_CACHE, }, | ||
222 | { "diag", AID_DIAG, }, | ||
223 | |||
224 | { "net_bt_admin", AID_NET_BT_ADMIN, }, | ||
225 | { "net_bt", AID_NET_BT, }, | ||
226 | { "inet", AID_INET, }, | ||
227 | { "net_raw", AID_NET_RAW, }, | ||
228 | { "net_admin", AID_NET_ADMIN, }, | ||
229 | { "net_bw_stats", AID_NET_BW_STATS, }, | ||
230 | { "net_bw_acct", AID_NET_BW_ACCT, }, | ||
231 | { "readproc", AID_READPROC, }, | ||
232 | { "wakelock", AID_WAKELOCK, }, | ||
233 | |||
234 | { "everybody", AID_EVERYBODY, }, | ||
235 | { "misc", AID_MISC, }, | ||
236 | { "nobody", AID_NOBODY, }, | ||
237 | }; | ||
238 | |||
239 | #define android_id_count \ | ||
240 | (sizeof(android_ids) / sizeof(android_ids[0])) | ||
241 | 152 | ||
242 | struct fs_path_config { | 153 | struct fs_path_config { |
243 | unsigned mode; | 154 | unsigned mode; |