tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 22f1e3d4: Apply https://android-git.corp.google.com/g/60855 to dalvik-dev.

Browse source 
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:
Brian Carlstrom 2010-08-18 13:39:12 -07:00 committed by Android Git Automerger
commit 0a4a393d71
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Android.mk
View file

@ -14,6 +14,11 @@
# limitations under the License. # limitations under the License.
# #
LOCAL_PATH := $(call my-dir)
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
include $(call all-subdir-makefiles) include $(call all-subdir-makefiles)
else
# The host dalvikvm needs Android's concatenated & indexed timezone data.
include $(LOCAL_PATH)/libc/zoneinfo/Android.mk
endif endif