commit 35237d135807af84bf9b0e5b8d7f8633e58db6f5
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:08:08 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:08:08 2008 -0800
tree d8bcf3ada2182d248604728285dd80abb466f22a
parent 4f6e8d7a00cbeda1e70cc15be9c4af1018bdad53

Code drop from //branches/cupcake/...@124589

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 3d0c12b..a43f7e3 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -60,6 +60,7 @@
         selector.c \
         fdevent.c \
         tztime.c \
+        tzstrftime.c \
         adb_networking.c \
 	zygote.c
 endif
@@ -91,8 +92,14 @@
 # ========================================================
 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)