commit 34dbdd17c8b557b9bdbedb5f3330bbd582773abc
author Brian Carlstrom <bdc@google.com> Thu Apr 02 13:44:40 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 02 13:44:40 2015 +0000
tree 968572cda1cb55bf8bbc589a2255dbb393ebf26e
parent c0128dec4240cf8ff427e45e3eeefdd46dcf7cb0
parent b37420c40f45976641c70d265fc96891decc8e34

am c7cddffa: Merge "Fix shared version of libcutils on the host to include strlcpy"

* commit 'c7cddffa14369265c82e5a08797f7ba687d174ef':
  Fix shared version of libcutils on the host to include strlcpy

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 9f32307..0cd560d 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -22,6 +22,7 @@
 	native_handle.c \
 	config_utils.c \
 	load_file.c \
+	memory.c \
 	open_memstream.c \
 	strdup16to8.c \
 	strdup8to16.c \
@@ -113,7 +114,6 @@
         ashmem-dev.c \
         debugger.c \
         klog.c \
-        memory.c \
         partition_utils.c \
         properties.c \
         qtaguid.c \