am f2a2406b: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"

* commit 'f2a2406b8c01e71603feaa5eaccd75d26ea76804':
  Remove dependencies on runtime_libdvm and libdvm.so in general
This commit is contained in:
Brian Carlstrom 2014-05-29 19:39:49 +00:00 committed by Android Git Automerger
commit 2267c22b3d
2 changed files with 3 additions and 1 deletions

View File

@ -230,6 +230,9 @@ $(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)
# Switching PRODUCT_RUNTIMES default for some devices
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************

View File

@ -75,7 +75,6 @@ PRODUCT_BOOT_JARS := \
webviewchromium
PRODUCT_RUNTIMES := runtime_libart_default
PRODUCT_RUNTIMES += runtime_libdvm
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32