commit 00a48b3df717bd5d76a24536c0c7eb58840402b3
author Nicolas Geoffray <ngeoffray@google.com> Mon Jan 17 12:23:19 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 17 12:23:19 2022 +0000
tree 0fd2a28f7dabd1f205a1329ead2def88096b201f
parent 4fe2a45dc7a000560dfd32afea64b119c6a6dc11
parent 50930076a2e29e1cb9f4d62e52791377943c0bf3

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

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 9a797f2..56007e2 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=libart.so
+ADDITIONAL_VENDOR_PROPERTIES += persist.sys.dalvik.vm.lib.2=
 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)