Merge "Set an empty persist.sys.dalvik.vm.lib.2 to simplify debug apex testing." am: 00a48b3df7 am: 3cb208e273 am: d43a0701d9

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

Change-Id: I107975440f1d9d9ae1ec8b57593cb7b7d2fdbeeb
This commit is contained in:
Nicolas Geoffray
2022-01-17 13:16:45 +00:00
committed by Automerger Merge Worker

View File

@@ -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)