am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit 'b9c2a66a4897b9be02d53f36bf9d212141c2dfb0':
  Now zoneinfo prebuilts are Android modules.
This commit is contained in:
Elliott Hughes
2012-07-27 15:47:34 -07:00
committed by Android Git Automerger

View File

@@ -122,6 +122,9 @@ PRODUCT_PACKAGES := \
uiautomator \ uiautomator \
telephony-common \ telephony-common \
mms-common \ mms-common \
zoneinfo.dat \
zoneinfo.idx \
zoneinfo.version
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \ system/core/rootdir/init.usb.rc:root/init.usb.rc \
@@ -140,5 +143,8 @@ ifeq ($(WITH_HOST_DALVIK),true)
libjavacore \ libjavacore \
libssl \ libssl \
libz-host \ libz-host \
dalvik dalvik \
zoneinfo-host.dat \
zoneinfo-host.idx \
zoneinfo-host.version
endif endif