am ed30b7ea: Merge "Fix build."

* commit 'ed30b7ea75532a5b2963acb8bae23e73493a851b':
  Fix build.

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