Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
(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 18a859aff4e1b97d644429b7ecdb366b18d5a708 Change-Id: I66647e824c5fee9b8d2c63085e2a58e5910a5544
This commit is contained in:
parent
a716190241
commit
22f1e3d4fa
@ -14,6 +14,11 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
|
||||
ifneq ($(TARGET_SIMULATOR),true)
|
||||
include $(call all-subdir-makefiles)
|
||||
else
|
||||
# The host dalvikvm needs Android's concatenated & indexed timezone data.
|
||||
include $(LOCAL_PATH)/libc/zoneinfo/Android.mk
|
||||
endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user