summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2014-06-04 00:11:52 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-04 00:11:52 +0000
commit53363f4fa0e8ab38f0b75252b105162b6d86354f (patch)
treeb0e42bfca33273a9e86da17a58764023af1694fd
parent3c9f410e1679fe42257872e98ffa544ca0cdd691 (diff)
parent5a8335c3185ec329bf43b1edc733aef38ce76c36 (diff)
downloadsystem_core-53363f4fa0e8ab38f0b75252b105162b6d86354f.zip
system_core-53363f4fa0e8ab38f0b75252b105162b6d86354f.tar.gz
system_core-53363f4fa0e8ab38f0b75252b105162b6d86354f.tar.bz2
am 5a8335c3: am ed30b7ea: Merge "Fix build."
* commit '5a8335c3185ec329bf43b1edc733aef38ce76c36': Fix build.
-rw-r--r--libcutils/Android.mk18
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