diff options
| author | Orion Hodson <oth@google.com> | 2020-03-06 08:50:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-06 08:50:22 +0000 |
| commit | 032fe38ea9c601062111aed783512edc1eb710ab (patch) | |
| tree | 918ce5d726406a47a38fc182a0e7640a1784a3fe | |
| parent | a1642feefb6f694b8d48ff66c6b75cbf84fd3a87 (diff) | |
| parent | 71ae455739e700283fd3a899ffec45ffb307458a (diff) | |
| download | android_frameworks_native-032fe38ea9c601062111aed783512edc1eb710ab.tar.gz android_frameworks_native-032fe38ea9c601062111aed783512edc1eb710ab.tar.bz2 android_frameworks_native-032fe38ea9c601062111aed783512edc1eb710ab.zip | |
Merge "installd: add dex2oat cpu-set system properties" into qt-qpr1-dev
| -rw-r--r-- | cmds/installd/dexopt.cpp | 5 | ||||
| -rw-r--r-- | cmds/installd/otapreopt.cpp | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp index dbb4f2237..5fb13a5c5 100644 --- a/cmds/installd/dexopt.cpp +++ b/cmds/installd/dexopt.cpp @@ -336,6 +336,10 @@ class RunDex2Oat : public ExecVHelper { ? "dalvik.vm.dex2oat-threads" : "dalvik.vm.boot-dex2oat-threads"; std::string dex2oat_threads_arg = MapPropertyToArg(threads_property, "-j%s"); + const char* cpu_set_property = post_bootcomplete + ? "dalvik.vm.dex2oat-cpu-set" + : "dalvik.vm.boot-dex2oat-cpu-set"; + std::string dex2oat_cpu_set_arg = MapPropertyToArg(cpu_set_property, "--cpu-set=%s"); std::string bootclasspath; char* dex2oat_bootclasspath = getenv("DEX2OATBOOTCLASSPATH"); @@ -507,6 +511,7 @@ class RunDex2Oat : public ExecVHelper { AddArg(image_block_size_arg); AddArg(dex2oat_compiler_filter_arg); AddArg(dex2oat_threads_arg); + AddArg(dex2oat_cpu_set_arg); AddArg(dex2oat_swap_fd); AddArg(dex2oat_image_fd); diff --git a/cmds/installd/otapreopt.cpp b/cmds/installd/otapreopt.cpp index de7b2499b..9bc5fc81d 100644 --- a/cmds/installd/otapreopt.cpp +++ b/cmds/installd/otapreopt.cpp @@ -478,6 +478,10 @@ private: "-j", false, cmd); + AddCompilerOptionFromSystemProperty("dalvik.vm.image-dex2oat-cpu-set", + "--cpu-set=", + false, + cmd); AddCompilerOptionFromSystemProperty( StringPrintf("dalvik.vm.isa.%s.variant", isa).c_str(), "--instruction-set-variant=", |