diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-06-03 22:35:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-03 22:35:23 +0000 |
| commit | ed30b7ea75532a5b2963acb8bae23e73493a851b (patch) | |
| tree | af6be1d722f3c25a78558ccb87c2173557f134b8 | |
| parent | d3b61d184ecffc4ac69e8573fcb00cc295a0d550 (diff) | |
| parent | 0b9674f2418cdc1f2ff20aae2c023443e322b901 (diff) | |
| download | system_core-ed30b7ea75532a5b2963acb8bae23e73493a851b.zip system_core-ed30b7ea75532a5b2963acb8bae23e73493a851b.tar.gz system_core-ed30b7ea75532a5b2963acb8bae23e73493a851b.tar.bz2 | |
Merge "Fix build."
| -rw-r--r-- | libcutils/Android.mk | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index e1d6f49..3a3f4c5 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -40,9 +40,6 @@ commonSources := \ iosched_policy.c \ str_parms.c \ -commonHostSources := \ - ashmem-host.c - # some files must not be compiled when building against Mingw # they correspond to features not used by our host development tools # which are also hard or even impossible to port to native Win32 @@ -59,15 +56,16 @@ endif ifneq ($(WINDOWS_HOST_ONLY),1) commonSources += \ + ashmem-host.cc \ fs.c \ multiuser.c \ - socket_inaddr_any_server.c \ - socket_local_client.c \ - socket_local_server.c \ - socket_loopback_client.c \ - socket_loopback_server.c \ - socket_network_client.c \ - sockets.c \ + socket_inaddr_any_server.c \ + socket_local_client.c \ + socket_local_server.c \ + socket_loopback_client.c \ + socket_loopback_server.c \ + socket_network_client.c \ + sockets.c \ endif |