From a00ba56c63b0bc5343a481c7e44863f6bcdb183d Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 11 Jun 2014 16:30:04 -0700 Subject: [PATCH] Remove some uses of the deprecated WITH_HOST_DALVIK. Bug: 13751317. Change-Id: I4beb81089b4ad7dac4d87571509389d1dae22bf3 --- target/product/runtime_common.mk | 17 ----------------- target/product/runtime_libart.mk | 6 ------ target/product/runtime_libdvm.mk | 6 ------ 3 files changed, 29 deletions(-) diff --git a/target/product/runtime_common.mk b/target/product/runtime_common.mk index faa6fe847c..9ae182a371 100644 --- a/target/product/runtime_common.mk +++ b/target/product/runtime_common.mk @@ -39,20 +39,3 @@ PRODUCT_PACKAGES += \ libssl \ libz \ okhttp - -# host-only dependencies -ifeq ($(WITH_HOST_DALVIK),true) - PRODUCT_PACKAGES += \ - apache-xml-hostdex \ - bouncycastle-hostdex \ - conscrypt-hostdex \ - dalvik \ - libcrypto-host \ - libexpat-host \ - libicui18n-host \ - libicuuc-host \ - libjavacore \ - libssl-host \ - libz-host \ - okhttp-hostdex -endif diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 1a7c925bd7..de4cf179db 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -22,10 +22,4 @@ PRODUCT_PACKAGES += \ dex2oat \ oatdump -# host-only dependencies -ifeq ($(WITH_HOST_DALVIK),true) - PRODUCT_PACKAGES += \ - core-libart-hostdex -endif - include $(SRC_TARGET_DIR)/product/runtime_common.mk diff --git a/target/product/runtime_libdvm.mk b/target/product/runtime_libdvm.mk index e7647b835c..638d7d7937 100644 --- a/target/product/runtime_libdvm.mk +++ b/target/product/runtime_libdvm.mk @@ -21,10 +21,4 @@ PRODUCT_PACKAGES += \ libdvm \ dexopt -# host-only dependencies -ifeq ($(WITH_HOST_DALVIK),true) - PRODUCT_PACKAGES += \ - core-hostdex -endif - include $(SRC_TARGET_DIR)/product/runtime_common.mk