Remove dependencies on runtime_libdvm and libdvm.so in general
Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0af94e0..86c555b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -252,6 +252,9 @@
# 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
# ************************************************
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 21b3398..8c1e575 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -92,7 +92,6 @@
wifi-service
PRODUCT_RUNTIMES := runtime_libart_default
-PRODUCT_RUNTIMES += runtime_libdvm
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 4d49121..87e24e4 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -83,7 +83,7 @@
apache-xml \
nullwebview
-PRODUCT_RUNTIMES := runtime_libdvm_default
+PRODUCT_RUNTIMES := runtime_libart_default
PRODUCT_PROPERTY_OVERRIDES += \
ro.carrier=unknown