am cba215dd: am d21197d5: Merge "Make libart the default runtime"

* commit 'cba215dd3241ae62416800f8d97d114d8a6e1a9a':
  Make libart the default runtime
This commit is contained in:
Brian Carlstrom
2014-01-29 00:41:31 +00:00
committed by Android Git Automerger

View File

@@ -72,7 +72,7 @@ PRODUCT_BOOT_JARS := \
apache-xml \
webviewchromium
PRODUCT_RUNTIMES := runtime_libdvm_default
PRODUCT_RUNTIMES += runtime_libart
PRODUCT_RUNTIMES := runtime_libart_default
PRODUCT_RUNTIMES += runtime_libdvm
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)