am 9a954de3: am 8fb55d06: Merge "Remove some uses of the deprecated WITH_HOST_DALVIK."

* commit '9a954de366bad8ba2cce2cb6c917a1bec7c61c77':
  Remove some uses of the deprecated WITH_HOST_DALVIK.
This commit is contained in:
Brian Carlstrom 2014-06-18 20:51:14 +00:00 committed by Android Git Automerger
commit 0d073451e7
3 changed files with 0 additions and 29 deletions

View file

@ -39,20 +39,3 @@ PRODUCT_PACKAGES += \
libssl \ libssl \
libz \ libz \
okhttp 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

View file

@ -22,10 +22,4 @@ PRODUCT_PACKAGES += \
dex2oat \ dex2oat \
oatdump oatdump
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \
core-libart-hostdex
endif
include $(SRC_TARGET_DIR)/product/runtime_common.mk include $(SRC_TARGET_DIR)/product/runtime_common.mk

View file

@ -21,10 +21,4 @@ PRODUCT_PACKAGES += \
libdvm \ libdvm \
dexopt dexopt
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \
core-hostdex
endif
include $(SRC_TARGET_DIR)/product/runtime_common.mk include $(SRC_TARGET_DIR)/product/runtime_common.mk