summaryrefslogtreecommitdiffstats
path: root/libcutils/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r--libcutils/Android.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 3d0c12b1d..a43f7e3e4 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -60,6 +60,7 @@ else
selector.c \
fdevent.c \
tztime.c \
+ tzstrftime.c \
adb_networking.c \
zygote.c
endif
@@ -91,8 +92,14 @@ else #!sim
# ========================================================
include $(CLEAR_VARS)
LOCAL_MODULE := libcutils
-LOCAL_SRC_FILES := $(commonSources) memset32.S atomic-android-arm.S mq.c \
- ashmem-dev.c
+LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_SRC_FILES += memset32.S atomic-android-arm.S
+else # !arm
+LOCAL_SRC_FILES += memory.c
+endif # !arm
+
LOCAL_C_INCLUDES := $(KERNEL_HEADERS)
LOCAL_STATIC_LIBRARIES := liblog
include $(BUILD_STATIC_LIBRARY)