commit 2005f395dedcded705de2af302b3b4a7ecba6adb
author Android Build Merger (Role) <android-build-merger@google.com> Fri Jun 23 02:07:31 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 23 02:07:32 2017 +0000
tree cbbc0d5bec1fdef615465a04fd4e2a5e0bac82ed
parent 908577a4f4b872dbb25c83351f81e8f1de9cc202
parent 9d8d51a7e5d958e8008eee3e762f5392601a34dd

Merge "Merge "Build: Use ART phony packages in runtime_libart" am: 47b734db57 am: 2d3b1ca45a am: ac1a012d21" into oc-dr1-dev-plus-aosp

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index c1b5c64..24eeff9 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 += \