commit 08fbf0f75a1d64eb2c0864a25e5a34a5fb25426d
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 24 14:17:56 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 24 14:17:56 2022 +0000
tree 3f3b2db3f100b9632b1d04dc547e983c9ccdad8b
parent 5b6d4a2e13f3c1584904273862a88770a1e7471e
parent 7d0f8dd33206eb001a8c2aac1b599251792a1ae3

Merge "Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."" am: 7d0f8dd332

Original change: https://android-review.googlesource.com/c/platform/build/+/1952765

Change-Id: I2abcaf902b4817ee477ad57074dde7e587b6eb85

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 986cbc3..32ea2da 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -240,7 +240,7 @@
 ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.2nd_arch=$(TARGET_2ND_ARCH)
 ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.2nd_cpu_variant=$(TARGET_2ND_CPU_VARIANT_RUNTIME)
 
-ADDITIONAL_VENDOR_PROPERTIES += persist.sys.dalvik.vm.lib.2=
+ADDITIONAL_VENDOR_PROPERTIES += persist.sys.dalvik.vm.lib.2=libart.so
 ADDITIONAL_VENDOR_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).variant=$(DEX2OAT_TARGET_CPU_VARIANT_RUNTIME)
 ifneq ($(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES),)
   ADDITIONAL_VENDOR_PROPERTIES += dalvik.vm.isa.$(TARGET_ARCH).features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES)