Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6537647d authored by Florian Mayer's avatar Florian Mayer Committed by Automerger Merge Worker
Browse files

Merge "Skip DexoptDex2oat64Enabled on 64bit-only builds." am: b68a6559 am:... 

Merge "Skip DexoptDex2oat64Enabled on 64bit-only builds." am: b68a6559 am: c95d039d am: 4279e478

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2093163



Change-Id: I76cc0710c147c63eebbbbf47b510dbf85edce77a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8024aa90 4279e478

cmds/installd/tests/installd_dexopt_test.cpp

+5 −0
Original line number Diff line number Diff line
@@ -920,6 +920,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([=]() {