]> git.saurik.com Git - android/aapt.git/commitdiff
am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false",...
authorEric Fischer <enf@google.com>
Fri, 13 Aug 2010 21:56:47 +0000 (14:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Aug 2010 21:56:47 +0000 (14:56 -0700)
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp

* commit '244152bfb9020341953d3e541c85eb3961806378':
  Change aapt's warning message to suggest formatted="false", not "true".

Android.mk

index b339a2cd2eb024809bf9de0081fe4fe9160a8ccc..094b7db3b4c4c9cd7f9b46a165c4718b25fb87da 100644 (file)
@@ -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),