am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.

Merge commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543' into gingerbread-plus-aosp

* commit '0a6bfe2ae21f19adf65d8b8a18c530d94ea4e543':
  Add --max-res-version flag to aapt.

diff --git a/Android.mk b/Android.mk
index b339a2cd2eb024809bf9de0081fe4fe9160a8ccc..094b7db3b4c4c9cd7f9b46a165c4718b25fb87da 100644 (file)
--- a/Android.mk
+++ b/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),