commit 47b734db5783d4c6d7fa308b02ecff9f65afe53e
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 23 01:47:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 23 01:47:33 2017 +0000
tree 3c4124fd23b0efbecde9bc4aace325c079afb08b
parent 8fb65a5d63864a677180c80a0cf10cfdab9ba903
parent ae4916b0ad2a39a552bbbb079af6f399d8bfaad1

Merge "Build: Use ART phony packages in runtime_libart"

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index b120298..0214bd0 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -41,7 +41,6 @@
 PRODUCT_PACKAGES += \
     libjavacore \
     libopenjdk \
-    libopenjdkjvm \
 
 # Libcore ICU. TODO: Try to figure out if/why we need them explicitly.
 PRODUCT_PACKAGES += \
@@ -49,24 +48,9 @@
     libicuuc \
 
 # ART.
-PRODUCT_PACKAGES += \
-    dalvikvm \
-    dex2oat \
-    dexoptanalyzer \
-    libart \
-    libart_fake \
-    libopenjdkjvmti \
-    patchoat \
-    profman
-
+PRODUCT_PACKAGES += art-runtime
 # ART/dex helpers.
-PRODUCT_PACKAGES += \
-    ahat \
-    dexdiag \
-    dexdump \
-    dexlist \
-    hprof-conv \
-    oatdump \
+PRODUCT_PACKAGES += art-tools
 
 # Certificates.
 PRODUCT_PACKAGES += \