22f1e3d4fa
(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 18a859aff4
Change-Id: I66647e824c5fee9b8d2c63085e2a58e5910a5544
25 lines
843 B
Makefile
25 lines
843 B
Makefile
#
|
|
# Copyright (C) 2008 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# 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
|