From 50930076a2e29e1cb9f4d62e52791377943c0bf3 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 13 Jan 2022 18:15:17 +0000 Subject: [PATCH] Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing. Keep the property for now to keep the ability to toggle on/off the library we want. If we want to remove this functionality, we need to cleanup all references to persist.sys.dalvik.vm.lib.2. Test: build and boot with debug apex Bug: 214049018 Change-Id: I66c7eb510f5a8b7974391ceafd309fba59a524a1 --- core/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/main.mk b/core/main.mk index d17f0cbe5b..7a126da948 100644 --- a/core/main.mk +++ b/core/main.mk @@ -240,7 +240,7 @@ ADDITIONAL_VENDOR_PROPERTIES += ro.bionic.cpu_variant=$(TARGET_CPU_VARIANT_RUNTI 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)