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

am a5726eb9: Merge "Use current max product dalvik.vm.heapsize as default dex2oat heap size"

Browse Source 
* commit 'a5726eb954588bd27ffa55a5193e7c0f8bd9eac3':
  Use current max product dalvik.vm.heapsize as default dex2oat heap size
This commit is contained in:
Brian Carlstrom 2014-06-27 23:02:11 +00:00 committed by Android Git Automerger
commit 1da16cebe6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/installd/commands.c
View File

@ -633,6 +633,11 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
bool profiler = (property_get("dalvik.vm.profiler", prop_buf, "0") > 0) && (prop_buf[0] == '1'); bool profiler = (property_get("dalvik.vm.profiler", prop_buf, "0") > 0) && (prop_buf[0] == '1');
static const char* DEX2OAT_BIN = "/system/bin/dex2oat"; static const char* DEX2OAT_BIN = "/system/bin/dex2oat";
// TODO: Make this memory value configurable with a system property b/15919420
static const char* RUNTIME_ARG = "--runtime-arg";
static const char* MEMORY_MAX_ARG = "-Xmx512m";
static const int MAX_INT_LEN = 12; // '-'+10dig+'\0' -OR- 0x+8dig static const int MAX_INT_LEN = 12; // '-'+10dig+'\0' -OR- 0x+8dig
static const unsigned int MAX_INSTRUCTION_SET_LEN = 32; static const unsigned int MAX_INSTRUCTION_SET_LEN = 32;
@ -676,12 +681,14 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
ALOGV("Running %s in=%s out=%s\n", DEX2OAT_BIN, input_file_name, output_file_name); ALOGV("Running %s in=%s out=%s\n", DEX2OAT_BIN, input_file_name, output_file_name);
char* argv[7 // program name, mandatory arguments and the final NULL char* argv[9 // program name, mandatory arguments and the final NULL
+ (have_profile_file ? 1 : 0) + (have_profile_file ? 1 : 0)
+ (have_top_k_profile_threshold ? 1 : 0) + (have_top_k_profile_threshold ? 1 : 0)
+ (have_dex2oat_flags ? 1 : 0)]; + (have_dex2oat_flags ? 1 : 0)];
int i = 0; int i = 0;
argv[i++] = (char*)DEX2OAT_BIN; argv[i++] = (char*)DEX2OAT_BIN;
argv[i++] = (char*)RUNTIME_ARG;
argv[i++] = (char*)MEMORY_MAX_ARG;
argv[i++] = zip_fd_arg; argv[i++] = zip_fd_arg;
argv[i++] = zip_location_arg; argv[i++] = zip_location_arg;
argv[i++] = oat_fd_arg; argv[i++] = oat_fd_arg;