diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-22 01:08:01 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-22 01:08:01 -0700 |
| commit | 67667115c51693ac27338be2aa7004789b15ff81 (patch) | |
| tree | 19b840f4ae9c91448722069085a5e97f6c5a1d10 /libcutils/Android.mk | |
| parent | b862ab74c95e4f76c7081ea5756c7ba719833f8c (diff) | |
| parent | ad3f0d74b4d0c52a819b0b4b242f26bd4ce07bc9 (diff) | |
| download | system_core-67667115c51693ac27338be2aa7004789b15ff81.tar.gz system_core-67667115c51693ac27338be2aa7004789b15ff81.tar.bz2 system_core-67667115c51693ac27338be2aa7004789b15ff81.zip | |
merge master to master_gl
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 3bc48fb6..aaee8bf2 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -17,6 +17,7 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) commonSources := \ + abort_socket.c \ array.c \ hashmap.c \ atomic.c \ @@ -62,7 +63,6 @@ else commonSources += \ mspace.c \ selector.c \ - fdevent.c \ tztime.c \ adb_networking.c \ zygote.c |