diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:28:10 -0800 |
---|---|---|
committer | Conley Owens <cco3@android.com> | 2013-11-22 13:44:43 -0800 |
commit | 66ed50af6870210ce013a5588a688434a5d48ee9 (patch) | |
tree | a879f3ea31083496d0efe491bc187b6e0ebada39 /libcutils/Android.mk | |
parent | dd2ac3de625e6c0328a0f70530d8ade0d2151bfc (diff) | |
parent | 536dea9d61a032e64bbe584a97463c6638ead009 (diff) | |
download | core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.gz core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.bz2 core-66ed50af6870210ce013a5588a688434a5d48ee9.zip |
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
Diffstat (limited to 'libcutils/Android.mk')
-rw-r--r-- | libcutils/Android.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 6207f1fce..f8dda3670 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -24,11 +24,9 @@ endif hostSmpFlag := -DANDROID_SMP=0 commonSources := \ - array.c \ hashmap.c \ atomic.c.arm \ native_handle.c \ - buffer.c \ socket_inaddr_any_server.c \ socket_local_client.c \ socket_local_server.c \ @@ -45,8 +43,6 @@ commonSources := \ strdup8to16.c \ record_stream.c \ process_name.c \ - properties.c \ - qsort_r_compat.c \ threads.c \ sched_policy.c \ iosched_policy.c \ @@ -69,16 +65,10 @@ ifneq ($(strip $(USE_MINGW)),) WINDOWS_HOST_ONLY := 1 endif -ifeq ($(WINDOWS_HOST_ONLY),1) +ifneq ($(WINDOWS_HOST_ONLY),1) commonSources += \ - uio.c -else - commonSources += \ - abort_socket.c \ fs.c \ - selector.c \ - multiuser.c \ - zygote.c + multiuser.c endif @@ -113,8 +103,8 @@ LOCAL_SRC_FILES := $(commonSources) \ ashmem-dev.c \ debugger.c \ klog.c \ - mq.c \ partition_utils.c \ + properties.c \ qtaguid.c \ trace.c \ uevent.c |