Skip to content

Commit 22f1e3d

Browse files
committed
(We've been missing the zoneinfo.* files for the host dalvikvm. My fix for gingerbread will have to wait for someone to return from vacation, but I can commit here in advance, and I need to so that I can submit https://android-git.corp.google.com/g/60790 which -- amongst other things -- makes lack of time zone data a hard failure, rather than just silently pretending all time zones are UTC.) Bug: 2870945 git cherry-pick --no-commit 18a859a Change-Id: I66647e824c5fee9b8d2c63085e2a58e5910a5544
1 parent a716190 commit 22f1e3d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Android.mk

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
# limitations under the License.
1515
#
1616

17+
LOCAL_PATH := $(call my-dir)
18+
1719
ifneq ($(TARGET_SIMULATOR),true)
1820
include $(call all-subdir-makefiles)
21+
else
22+
# The host dalvikvm needs Android's concatenated & indexed timezone data.
23+
include $(LOCAL_PATH)/libc/zoneinfo/Android.mk
1924
endif

0 commit comments

Comments
 (0)