commit 4ff406c4a19650a2ceb44081cc011f69c522b4da
author Nicolas Geoffray <ngeoffray@google.com> Wed Jan 19 16:22:07 2022 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Jan 19 16:22:07 2022 +0000
tree 09b304c0d5d12d252625ef809e70b5f3c0f73a6d
parent 50930076a2e29e1cb9f4d62e52791377943c0bf3

Revert "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing."

This reverts commit 50930076a2e29e1cb9f4d62e52791377943c0bf3.

Bug: 214049018

Reason for revert: Not needed after all.

Change-Id: Ifbf3053fd70c5880e58136821a2fb8b783c48e2a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 7a126da..d17f0cb 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)