am 1a36c59e: Merge "Remove tzdata from core.mk, now we have explicit dependencies."

* commit '1a36c59e41488dafe30aba1d2ccfd4ecd861c6ce':
  Remove tzdata from core.mk, now we have explicit dependencies.
This commit is contained in:
Elliott Hughes
2012-10-18 14:44:23 -07:00
committed by Android Git Automerger

View File

@@ -129,11 +129,7 @@ PRODUCT_PACKAGES += \
lint \ lint \
uiautomator \ uiautomator \
telephony-common \ telephony-common \
mms-common \ mms-common
tzdata \
zoneinfo.dat \
zoneinfo.idx \
zoneinfo.version
# SELinux packages # SELinux packages
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@@ -160,11 +156,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
libjavacore \ libjavacore \
libssl \ libssl \
libz-host \ libz-host \
dalvik \ dalvik
tzdata-host \
zoneinfo-host.dat \
zoneinfo-host.idx \
zoneinfo-host.version
endif endif
$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)