am 22f1e3d4
: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
Merge commit '22f1e3d4fae7d45cc439da94690d786ed44756fb' into gingerbread-plus-aosp * commit '22f1e3d4fae7d45cc439da94690d786ed44756fb': Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.
This commit is contained in:
commit
0a4a393d71
1 changed files with 5 additions and 0 deletions
|
@ -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…
Reference in a new issue