From: Ficus Kirkpatrick <ficus@android.com>
Date: Fri, 13 Aug 2010 21:47:38 +0000 (-0700)
Subject: am 0a6bfe2a: am 2abde6e0: Add --max-res-version flag to aapt.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/671d70ce5c623bb95729efa5a59ef10752729985?hp=cd16e80ffcfc3d7484a643067ad19795b524c194

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 b339a2c..094b7db 100644
--- 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),