Merge "Use mmap to create the pthread_internal_t"

[android-sdk/platform-bionic.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 43d5499e3a9530f64e0d3d9d25b5ae724d18aa65..7c39751048ccf4a6bb02ba987f8962d421f0d548 100644 (file)
--- 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)