| commit | c7cddffa14369265c82e5a08797f7ba687d174ef | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Apr 02 07:51:10 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 02 07:51:10 2015 +0000 |
| tree | 9151576f3a5dd894a224d0e1ccd56e4888bb2971 | |
| parent | fad9b3ebb8f5966e2afd7ff65d78ecc3330aaa3e [diff] | |
| parent | 60a347fc87ad544f15335ffe97817058fe87d4f2 [diff] |
Merge "Fix shared version of libcutils on the host to include strlcpy"
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 \