commit a4ba587282779ab3081966fb65f1e59a819fe85c
author Brian Carlstrom <bdc@google.com> Wed Jun 26 05:30:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 26 05:30:18 2013 +0000
tree de708257e6d7cab67d0f9444ab9c1e8428919f95
parent 3ba9cb2439a079dba4052ebd4056559ab68ab621
parent 3d0507d3a1692524c7582947b744b2811292787d

Merge "Add support for dualbooting dalvik and art"

target/product/dalvikvm.mk

diff --git a/target/product/dalvikvm.mk b/target/product/dalvikvm.mk
index b7003b9..beed32b 100644
--- a/target/product/dalvikvm.mk
+++ b/target/product/dalvikvm.mk
@@ -18,10 +18,12 @@
 
 ifeq ($(WITH_ART),false)
     PRODUCT_PACKAGES += \
+        core \
         libdvm \
         dexopt
 else
     PRODUCT_PACKAGES += \
+        core-libart \
         libart \
         dex2oat
     PRODUCT_PROPERTY_OVERRIDES += \
@@ -33,7 +35,6 @@
     bouncycastle \
     cacerts \
     conscrypt \
-    core \
     core-junit \
     dalvikvm \
     dexdeps \
@@ -56,11 +57,17 @@
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
+    ifeq ($(WITH_ART),false)
+        PRODUCT_PACKAGES += \
+            core-hostdex
+    else
+        PRODUCT_PACKAGES += \
+            core-libart-hostdex
+    endif
     PRODUCT_PACKAGES += \
         apache-xml-hostdex \
         bouncycastle-hostdex \
         conscrypt-hostdex \
-        core-hostdex \
         dalvik \
         libcrypto-host \
         libexpat-host \