summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-06-13 20:25:29 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-06-13 20:25:29 -0700
commit28a6c8e9b366ecfc3518e6b0fb1d1bc46cf823e8 (patch)
treef5406ef42ab2bd1e2fbb3341200069fcde414a99
parent5e95930bd87b98b01ffe48075fa13c234c2ed08f (diff)
parentd890cbf700695c869e6b45cddf7f132484697588 (diff)
am d890cbf7: Remove PollLoop from host build.
Merge commit 'd890cbf700695c869e6b45cddf7f132484697588' into gingerbread * commit 'd890cbf700695c869e6b45cddf7f132484697588': Remove PollLoop from host build.
-rw-r--r--libs/utils/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/utils/Android.mk b/libs/utils/Android.mk
index 945b03958de0..7d4524aa5620 100644
--- a/libs/utils/Android.mk
+++ b/libs/utils/Android.mk
@@ -26,7 +26,6 @@ commonSources:= \
Debug.cpp \
FileMap.cpp \
Flattenable.cpp \
- PollLoop.cpp \
Pool.cpp \
RefBase.cpp \
ResourceTypes.cpp \
@@ -41,7 +40,7 @@ commonSources:= \
Threads.cpp \
Timers.cpp \
VectorImpl.cpp \
- ZipFileCRO.cpp \
+ ZipFileCRO.cpp \
ZipFileRO.cpp \
ZipUtils.cpp \
misc.cpp
@@ -78,8 +77,9 @@ include $(CLEAR_VARS)
# we have the common sources, plus some device-specific stuff
LOCAL_SRC_FILES:= \
$(commonSources) \
- BackupData.cpp \
- BackupHelpers.cpp
+ BackupData.cpp \
+ BackupHelpers.cpp \
+ PollLoop.cpp
ifeq ($(TARGET_OS),linux)
LOCAL_LDLIBS += -lrt -ldl