commit 4f78caaa4ef2a5b3171ffacf9025d1b149ee53c5
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 24 14:35:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 24 14:35:04 2022 +0000
tree 73bd89ed328727ecf9d7b13c9467192387e4f6ba
parent 2de0ca59d6ad02f7626704bb96f87618ca220e88
parent 08fbf0f75a1d64eb2c0864a25e5a34a5fb25426d

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

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

Change-Id: I2e9363f35a74ab594e7bcc2308cb641ffe93d405

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)