aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-11 22:11:41 -0700
committerJeff Brown <jeffbrown@google.com>2011-07-11 22:11:41 -0700
commit7e5d19c055e50232fc566978e2bab332ccc6894e (patch)
tree98bf68cb3ea6dacbb84632c8aa494ce907f138a2 /Android.mk
parent221595a085fc8fa4eed2c4143402a085aa931aed (diff)
downloadandroid_bionic-7e5d19c055e50232fc566978e2bab332ccc6894e.tar.gz
android_bionic-7e5d19c055e50232fc566978e2bab332ccc6894e.tar.bz2
android_bionic-7e5d19c055e50232fc566978e2bab332ccc6894e.zip
Remove the simulator target from all makefiles.
Bug: 5010576 Change-Id: I9064e3221582fcf3d4210d67f1cf0a96e7e3aa86
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index 43d5499e3..7c3975104 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,9 +16,4 @@
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
+include $(call all-subdir-makefiles)