summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-28 21:27:47 -0700
committerBrian Carlstrom <bdc@google.com>2014-05-29 09:37:25 -0700
commit1e60fe58f0a66c4281a9c0050ce4d706d342bd22 (patch)
tree137f855117fc4cbf8d8bad418354fdd064cd31f5
parentb3bed5952b44e69dc9e1988beb4092303084ef61 (diff)
downloadbuild-1e60fe58f0a66c4281a9c0050ce4d706d342bd22.zip
build-1e60fe58f0a66c4281a9c0050ce4d706d342bd22.tar.gz
build-1e60fe58f0a66c4281a9c0050ce4d706d342bd22.tar.bz2
Remove dependencies on runtime_libdvm and libdvm.so in general
Bug: 14298175 (cherry picked from commit bf8a374a92e327efed95892fe67e6917a89c6c2b) Change-Id: I183d1ff078a54c422305d8798ea200855265ebb6
-rw-r--r--CleanSpec.mk3
-rw-r--r--target/product/core_minimal.mk1
2 files changed, 3 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 76653f4..9cbd67a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -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
# ************************************************
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 @@ PRODUCT_BOOT_JARS := \
webviewchromium
PRODUCT_RUNTIMES := runtime_libart_default
-PRODUCT_RUNTIMES += runtime_libdvm
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.zygote=zygote32