Merge "Fix linux 64 build" into gingerbread

2010-08-25 09:28:00 -07:00
parent 231a000565 74b58fc58b
commit 59073b155a
2 changed files with 2 additions and 2 deletions
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -41,7 +41,7 @@ LOCAL_STATIC_LIBRARIES := \
 	libpng

 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt -lpthread
 endif

 # Statically link libz for MinGW (Win SDK under Linux),
--- a/tools/localize/Android.mk
+++ b/tools/localize/Android.mk
@@ -34,7 +34,7 @@ LOCAL_STATIC_LIBRARIES := \
 	libcutils
    
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt
+LOCAL_LDLIBS += -lrt -lpthread
 endif