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

Commit ed97938c authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 

* commit '7df64f7c':
  Move to dalvik.vm.lib.2 to force default to libart
parents 8898f2e2 7df64f7c

CleanSpec.mk

+3 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)



# Rename persist.sys.dalvik.vm.lib.1 to allow new default

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

core/product_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ $(call clear-var-list, $(_product_var_list)) 
PRODUCT_RUNTIMES := $(product_runtimes)

product_runtimes :=



PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.1=$(DALVIK_VM_LIB)

PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.2=$(DALVIK_VM_LIB)



ifeq ($(words $(PRODUCT_RUNTIMES)),1)

  # If we only have one runtime, we can strip classes.dex by default during dex_preopt