From ae4916b0ad2a39a552bbbb079af6f399d8bfaad1 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 22 Jun 2017 15:35:14 -0700 Subject: [PATCH] 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 --- target/product/runtime_libart.mk | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index b12029874c..0214bd0cd5 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -41,7 +41,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ libjavacore \ libopenjdk \ - libopenjdkjvm \ # Libcore ICU. TODO: Try to figure out if/why we need them explicitly. PRODUCT_PACKAGES += \ @@ -49,24 +48,9 @@ PRODUCT_PACKAGES += \ 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 += \