summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2017-01-09 19:15:29 -0600
committerGerrit Code Review2017-01-09 19:15:30 -0600
commitb2375fc40c674ad3e798069fb5ab9457ebc19260 (patch)
tree1ddbace73e8897373770b6faf6a54748ff3cd1b9 /include
parentd5583867c61867252d4a8d794704f9c2d40bbca8 (diff)
parente801a68239396f61751c3f8b94c44636719fc7ec (diff)
downloadplatform-system-core-b2375fc40c674ad3e798069fb5ab9457ebc19260.tar.gz
platform-system-core-b2375fc40c674ad3e798069fb5ab9457ebc19260.tar.xz
platform-system-core-b2375fc40c674ad3e798069fb5ab9457ebc19260.zip
Merge "Revert "Revert "android_ids: move to bionic"""
Diffstat (limited to 'include')
-rw-r--r--include/private/android_filesystem_config.h101
1 files changed, 6 insertions, 95 deletions
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index f7cf9b808..eb71fb82d 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -173,104 +173,15 @@
173#define AID_USER 100000 /* TODO: switch users over to AID_USER_OFFSET */ 173#define AID_USER 100000 /* TODO: switch users over to AID_USER_OFFSET */
174#define AID_USER_OFFSET 100000 /* offset for uid ranges for each user */ 174#define AID_USER_OFFSET 100000 /* offset for uid ranges for each user */
175 175
176#if !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
177/* 176/*
178 * Used in: 177 * android_ids has moved to pwd/grp functionality.
179 * bionic/libc/bionic/stubs.cpp 178 * If you need to add one, the structure is now
180 * external/libselinux/src/android.c 179 * auto-generated based on the AID_ constraints
181 * system/core/logd/LogStatistics.cpp 180 * documented at the top of this header file.
182 * system/core/init/ueventd.cpp 181 * Also see build/tools/fs_config for more details.
183 * system/core/init/util.cpp
184 */ 182 */
185struct android_id_info {
186 const char *name;
187 unsigned aid;
188};
189
190static const struct android_id_info android_ids[] = {
191 { "root", AID_ROOT, },
192
193 { "system", AID_SYSTEM, },
194
195 { "radio", AID_RADIO, },
196 { "bluetooth", AID_BLUETOOTH, },
197 { "graphics", AID_GRAPHICS, },
198 { "input", AID_INPUT, },
199 { "audio", AID_AUDIO, },
200 { "camera", AID_CAMERA, },
201 { "log", AID_LOG, },
202 { "compass", AID_COMPASS, },
203 { "mount", AID_MOUNT, },
204 { "wifi", AID_WIFI, },
205 { "adb", AID_ADB, },
206 { "install", AID_INSTALL, },
207 { "media", AID_MEDIA, },
208 { "dhcp", AID_DHCP, },
209 { "sdcard_rw", AID_SDCARD_RW, },
210 { "vpn", AID_VPN, },
211 { "keystore", AID_KEYSTORE, },
212 { "usb", AID_USB, },
213 { "drm", AID_DRM, },
214 { "mdnsr", AID_MDNSR, },
215 { "gps", AID_GPS, },
216 // AID_UNUSED1
217 { "media_rw", AID_MEDIA_RW, },
218 { "mtp", AID_MTP, },
219 // AID_UNUSED2
220 { "drmrpc", AID_DRMRPC, },
221 { "nfc", AID_NFC, },
222 { "sdcard_r", AID_SDCARD_R, },
223 { "clat", AID_CLAT, },
224 { "loop_radio", AID_LOOP_RADIO, },
225 { "mediadrm", AID_MEDIA_DRM, },
226 { "package_info", AID_PACKAGE_INFO, },
227 { "sdcard_pics", AID_SDCARD_PICS, },
228 { "sdcard_av", AID_SDCARD_AV, },
229 { "sdcard_all", AID_SDCARD_ALL, },
230 { "logd", AID_LOGD, },
231 { "shared_relro", AID_SHARED_RELRO, },
232 { "dbus", AID_DBUS, },
233 { "tlsdate", AID_TLSDATE, },
234 { "mediaex", AID_MEDIA_EX, },
235 { "audioserver", AID_AUDIOSERVER, },
236 { "metrics_coll", AID_METRICS_COLL },
237 { "metricsd", AID_METRICSD },
238 { "webserv", AID_WEBSERV },
239 { "debuggerd", AID_DEBUGGERD, },
240 { "mediacodec", AID_MEDIA_CODEC, },
241 { "cameraserver", AID_CAMERASERVER, },
242 { "firewall", AID_FIREWALL, },
243 { "trunks", AID_TRUNKS, },
244 { "nvram", AID_NVRAM, },
245 { "dns", AID_DNS, },
246 { "dns_tether", AID_DNS_TETHER, },
247 { "webview_zygote", AID_WEBVIEW_ZYGOTE, },
248 { "vehicle_network", AID_VEHICLE_NETWORK, },
249 { "media_audio", AID_MEDIA_AUDIO, },
250 { "media_video", AID_MEDIA_VIDEO, },
251 { "media_image", AID_MEDIA_IMAGE, },
252 183
253 { "shell", AID_SHELL, }, 184#if !defined(EXCLUDE_FS_CONFIG_STRUCTURES)
254 { "cache", AID_CACHE, },
255 { "diag", AID_DIAG, },
256
257 { "net_bt_admin", AID_NET_BT_ADMIN, },
258 { "net_bt", AID_NET_BT, },
259 { "inet", AID_INET, },
260 { "net_raw", AID_NET_RAW, },
261 { "net_admin", AID_NET_ADMIN, },
262 { "net_bw_stats", AID_NET_BW_STATS, },
263 { "net_bw_acct", AID_NET_BW_ACCT, },
264 { "readproc", AID_READPROC, },
265 { "wakelock", AID_WAKELOCK, },
266
267 { "everybody", AID_EVERYBODY, },
268 { "misc", AID_MISC, },
269 { "nobody", AID_NOBODY, },
270};
271
272#define android_id_count \
273 (sizeof(android_ids) / sizeof(android_ids[0]))
274 185
275struct fs_path_config { 186struct fs_path_config {
276 unsigned mode; 187 unsigned mode;