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

Store odex files in oat/<isa>/ directory.

Browse Source 
Previously odex files were stored alongside the dex location as:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/<isa>/base.odex

This changes where odex files are stored, adding an "oat" directory:
  dex location: /foo/bar/base.apk
  odex location: /foo/bar/oat/<isa>/base.odex

See also the corresponding changes in platform/art and platform/build.

Bug: 19550105
Change-Id: I4c6be4f0c41ff175904846db8e360c4af815b265
This commit is contained in:
Richard Uhler 2015-03-18 12:39:09 -07:00
parent a527c07b8d
commit 009b877132
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cmds/installd/commands.c
View File

@ -938,6 +938,42 @@ static bool ShouldUseSwapFileForDexopt() {
return (strcmp(low_mem_buf, "true") == 0);
}
/*
* Computes the odex file for the given apk_path and instruction_set.
* /system/framework/whatever.jar -> /system/framework/oat/<isa>/whatever.odex
*
* Returns false if it failed to determine the odex file path.
*/
static bool calculate_odex_file_path(char path[PKG_PATH_MAX],
const char *apk_path,
const char *instruction_set)
{
if (strlen(apk_path) + strlen("oat/") + strlen(instruction_set)
+ strlen("/") + strlen("odex") + 1 > PKG_PATH_MAX) {
ALOGE("apk_path '%s' may be too long to form odex file path.\n", apk_path);
return false;
}
strcpy(path, apk_path);
char *end = strrchr(path, '/');
if (end == NULL) {
ALOGE("apk_path '%s' has no '/'s in it?!\n", apk_path);
return false;
}
const char *apk_end = apk_path + (end - path); // strrchr(apk_path, '/');
strcpy(end + 1, "oat/"); // path = /system/framework/oat/\0
strcat(path, instruction_set); // path = /system/framework/oat/<isa>\0
strcat(path, apk_end); // path = /system/framework/oat/<isa>/whatever.jar\0
end = strrchr(path, '.');
if (end == NULL) {
ALOGE("apk_path '%s' has no extension.\n", apk_path);
return false;
}
strcpy(end + 1, "odex");
return true;
}
int dexopt(const char *apk_path, uid_t uid, bool is_public,
const char *pkgname, const char *instruction_set,
bool vm_safe_mode, bool is_patchoat, bool debuggable)
@ -977,21 +1013,9 @@ int dexopt(const char *apk_path, uid_t uid, bool is_public,
}
if (is_patchoat) {
/* /system/framework/whatever.jar -> /system/framework/<isa>/whatever.odex */
strcpy(in_odex_path, apk_path);
end = strrchr(in_odex_path, '/');
if (end == NULL) {
ALOGE("apk_path '%s' has no '/'s in it?!\n", apk_path);
return -1;
if (!calculate_odex_file_path(in_odex_path, apk_path, instruction_set)) {
return -1;
}
const char *apk_end = apk_path + (end - in_odex_path); // strrchr(apk_path, '/');
strcpy(end + 1, instruction_set); // in_odex_path now is /system/framework/<isa>\0
strcat(in_odex_path, apk_end);
end = strrchr(in_odex_path, '.');
if (end == NULL) {
return -1;
}
strcpy(end + 1, "odex");
input_file = in_odex_path;
} else {
input_file = apk_path;