diff options
| author | 2022-05-11 21:00:38 +0000 | |
|---|---|---|
| committer | 2022-05-11 21:00:38 +0000 | |
| commit | b68a655978b9b47f3301dedd57ea911569e8df94 (patch) | |
| tree | 366ad3763f8a9fa2b33d4aae2df7c0ec8517f6d1 | |
| parent | 864034bf750090c0522ba6a3cd1abb379999ba6e (diff) | |
| parent | e071fb2ec740cde7dd268185f1e794a0127f7887 (diff) | |
Merge "Skip DexoptDex2oat64Enabled on 64bit-only builds."
| -rw-r--r-- | cmds/installd/tests/installd_dexopt_test.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmds/installd/tests/installd_dexopt_test.cpp b/cmds/installd/tests/installd_dexopt_test.cpp index aeba451a48..800e141d92 100644 --- a/cmds/installd/tests/installd_dexopt_test.cpp +++ b/cmds/installd/tests/installd_dexopt_test.cpp @@ -879,6 +879,11 @@ TEST_F(DexoptTest, ResolveStartupConstStrings) { TEST_F(DexoptTest, DexoptDex2oat64Enabled) { LOG(INFO) << "DexoptDex2oat64Enabled"; + std::string zygote_prop = android::base::GetProperty("ro.zygote", ""); + ASSERT_GT(zygote_prop.size(), 0); + if (zygote_prop != "zygote32_64" && zygote_prop != "zygote64_32") { + GTEST_SKIP() << "DexoptDex2oat64Enabled skipped for single-bitness Zygote."; + } const std::string property = "dalvik.vm.dex2oat64.enabled"; const std::string previous_value = android::base::GetProperty(property, ""); auto restore_property = android::base::make_scope_guard([=]() { |