summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-10-31 21:48:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-31 21:48:30 +0000
commitbb3de35e5f7fc17d7f7eee68730c04b0c263172d (patch)
tree44b14451d6ae3bc0d19113c672840e42e3d8c5e6 /core/java
parent0fccecc6a0ba6f82ff43d4a885c9a2afc564c25c (diff)
parentc477ab141f9171f329c96b97ee073354847f727c (diff)
Merge changes I2ef3737f,If080281f
* changes: Add property for system server compiler filter Compile secondary dex at boot after OTA
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/ZygoteInit.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java
index 6d8b81170e21..2fd252170bbf 100644
--- a/core/java/com/android/internal/os/ZygoteInit.java
+++ b/core/java/com/android/internal/os/ZygoteInit.java
@@ -546,12 +546,13 @@ public class ZygoteInit {
for (String classPathElement : classPathElements) {
// System server is fully AOTed and never profiled
// for profile guided compilation.
- // TODO: Make this configurable between INTERPRET_ONLY, SPEED, SPACE and EVERYTHING?
+ String systemServerFilter = SystemProperties.get(
+ "dalvik.vm.systemservercompilerfilter", "speed");
int dexoptNeeded;
try {
dexoptNeeded = DexFile.getDexOptNeeded(
- classPathElement, instructionSet, "speed",
+ classPathElement, instructionSet, systemServerFilter,
false /* newProfile */, false /* downgrade */);
} catch (FileNotFoundException ignored) {
// Do not add to the classpath.
@@ -570,7 +571,7 @@ public class ZygoteInit {
final String packageName = "*";
final String outputPath = null;
final int dexFlags = 0;
- final String compilerFilter = "speed";
+ final String compilerFilter = systemServerFilter;
final String uuid = StorageManager.UUID_PRIVATE_INTERNAL;
final String seInfo = null;
try {