commit f2a2406b8c01e71603feaa5eaccd75d26ea76804
author Brian Carlstrom <bdc@google.com> Thu May 29 19:36:35 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 29 19:36:35 2014 +0000
tree 137f855117fc4cbf8d8bad418354fdd064cd31f5
parent b3bed5952b44e69dc9e1988beb4092303084ef61
parent 1e60fe58f0a66c4281a9c0050ce4d706d342bd22

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

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 76653f4..9cbd67a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -230,6 +230,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
 # ************************************************

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 7e2b19e..9cd2903 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -75,7 +75,6 @@
     webviewchromium
 
 PRODUCT_RUNTIMES := runtime_libart_default
-PRODUCT_RUNTIMES += runtime_libdvm
 
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     ro.zygote=zygote32