Build: Use ART phony packages in runtime_libart
Move definition of necessary packages for ART to art/Android.mk.
Use the phony packages defined there in runtime_libart.mk.
Bug: 62087184
Test: m
Test: Device boots
Change-Id: Iae6e5bba2184b098820783dc5e9f6b5f2a9836e9
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 += \