From bf8a374a92e327efed95892fe67e6917a89c6c2b Mon Sep 17 00:00:00 2001
From: Brian Carlstrom <bdc@google.com>
Date: Wed, 28 May 2014 21:27:47 -0700
Subject: [PATCH] Remove dependencies on runtime_libdvm and libdvm.so in
 general

Bug: 14298175
Change-Id: I8441b64dc33543a912aebcfb8fdf76114ec50abe
---
 CleanSpec.mk                   | 3 +++
 target/product/core_minimal.mk | 1 -
 target/product/core_tiny.mk    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 0af94e0809..86c555b3c7 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -252,6 +252,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.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
 # ************************************************
diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 21b3398228..8c1e575856 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -92,7 +92,6 @@ PRODUCT_BOOT_JARS := \
     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 4d4912167c..87e24e4a10 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -83,7 +83,7 @@ PRODUCT_BOOT_JARS := \
     apache-xml \
     nullwebview
 
-PRODUCT_RUNTIMES := runtime_libdvm_default
+PRODUCT_RUNTIMES := runtime_libart_default
 
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.carrier=unknown