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

Merge "Frameworks/base: Compiled-classes support" into lmp-sprout-dev

Browse Source
This commit is contained in:
Jeff Hao
2014-11-18 23:56:31 +00:00
committed by Android (Google) Code Review
parent b2a2d2c2fe cd9c6f508f
commit c6fdda5284
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/jni/AndroidRuntime.cpp
View File

@@ -356,6 +356,15 @@ static int hasDir(const char* dir)
return 0; 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. * Read the persistent locale.
*/ */
@@ -772,6 +781,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
addOption("--image-classes-zip=/system/framework/framework.jar"); addOption("--image-classes-zip=/system/framework/framework.jar");
addOption("-Ximage-compiler-option"); addOption("-Ximage-compiler-option");
addOption("--image-classes=preloaded-classes"); addOption("--image-classes=preloaded-classes");
// If there is a compiled-classes file, push it.
if (hasFile("/system/etc/compiled-classes")) {
addOption("-Ximage-compiler-option");
addOption("--compiled-classes=/system/etc/compiled-classes");
}
property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, ""); property_get("dalvik.vm.image-dex2oat-flags", dex2oatImageFlagsBuf, "");
parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option"); parseExtraOpts(dex2oatImageFlagsBuf, "-Ximage-compiler-option");