diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-18 00:33:52 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-18 00:33:52 -0700 |
| commit | 22f1e3d4fae7d45cc439da94690d786ed44756fb (patch) | |
| tree | c144084dd6e8e23cf9b75696194fc10b1036e919 /Android.mk | |
| parent | a716190241da07f42cf874b04bf044261f36381c (diff) | |
| download | bionic-22f1e3d4fae7d45cc439da94690d786ed44756fb.tar.gz | |
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
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index fcc8b96a7..43d5499e3 100644 --- a/Android.mk +++ b/Android.mk @@ -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 |