Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Frameworks/base: AndroidRuntime standalone preloaded-classes" into lmp-mr1-dev

Browse Source
This commit is contained in:
Ying Wang
2014-11-17 18:14:23 +00:00
committed by Android (Google) Code Review
parent 867a0de0b4 995c62d6ab
commit 7f5fbe9e11
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/jni/AndroidRuntime.cpp
View File

@@ -356,6 +356,15 @@ static int hasDir(const char* dir)
return 0;
}
static bool hasFile(const char* file) {
struct stat s;
int res = stat(file, &s);
if (res == 0) {
return S_ISREG(s.st_mode);
}
return false;
}
/*
* Read the persistent locale.
*/
@@ -768,10 +777,16 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
parseCompilerOption("dalvik.vm.image-dex2oat-filter", dex2oatImageCompilerFilterBuf,
"--compiler-filter=", "-Ximage-compiler-option");
}
// Make sure there is a preloaded-classes file.
if (!hasFile("/system/etc/preloaded-classes")) {
ALOGE("Missing preloaded-classes file, /system/etc/preloaded-classes not found: %s\n",
strerror(errno));
goto bail;
}
addOption("-Ximage-compiler-option");
addOption("--image-classes-zip=/system/framework/framework.jar");
addOption("-Ximage-compiler-option");
addOption("--image-classes=preloaded-classes");
addOption("--image-classes=/system/etc/preloaded-classes");
property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");
parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");