ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 4914f85f: am 8f43f77d: Merge "Use AID_SYSTEM as uid when creating oat dir"

Browse Source 
* commit '4914f85f8073073194da5a88c557220456777eda':
  Use AID_SYSTEM as uid when creating oat dir
This commit is contained in:
Fyodor Kupolov 2015-04-07 20:27:49 +00:00 committed by Android Git Automerger
commit b58e6cbfa7
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmds/installd/commands.c
View File

@ -1711,12 +1711,7 @@ int create_oat_dir(const char* oat_dir, const char* instruction_set)
ALOGE("invalid apk path '%s' (bad prefix)\n", oat_dir); ALOGE("invalid apk path '%s' (bad prefix)\n", oat_dir);
return -1; return -1;
} }
if ((mkdir(oat_dir, S_IRWXU|S_IRWXG|S_IXOTH) < 0) && (errno != EEXIST)) { if (fs_prepare_dir(oat_dir, S_IRWXU | S_IRWXG | S_IXOTH, AID_SYSTEM, AID_INSTALL)) {
ALOGE("cannot create dir '%s': %s\n", oat_dir, strerror(errno));
return -1;
}
if (chmod(oat_dir, S_IRWXU|S_IRWXG|S_IXOTH) < 0) {
ALOGE("cannot chmod dir '%s': %s\n", oat_dir, strerror(errno));
return -1; return -1;
} }
if (selinux_android_restorecon(oat_dir, 0)) { if (selinux_android_restorecon(oat_dir, 0)) {
@ -1724,12 +1719,7 @@ int create_oat_dir(const char* oat_dir, const char* instruction_set)
return -1; return -1;
} }
snprintf(oat_instr_dir, PKG_PATH_MAX, "%s/%s", oat_dir, instruction_set); snprintf(oat_instr_dir, PKG_PATH_MAX, "%s/%s", oat_dir, instruction_set);
if ((mkdir(oat_instr_dir, S_IRWXU|S_IRWXG|S_IXOTH) < 0) && (errno != EEXIST)) { if (fs_prepare_dir(oat_instr_dir, S_IRWXU | S_IRWXG | S_IXOTH, AID_SYSTEM, AID_INSTALL)) {
ALOGE("cannot create dir '%s': %s\n", oat_instr_dir, strerror(errno));
return -1;
}
if (chmod(oat_instr_dir, S_IRWXU|S_IRWXG|S_IXOTH) < 0) {
ALOGE("cannot chmod dir '%s': %s\n", oat_dir, strerror(errno));
return -1; return -1;
} }
return 0; return 0;