Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08fbf0f7 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I2abcaf902b4817ee477ad57074dde7e587b6eb85
parents 5b6d4a2e 7d0f8dd3

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -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=

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)