diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 10:07:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-11 10:07:56 -0700 |
| commit | f252b3501e6a9893ba3cc7608dbdeab68d8aecb9 (patch) | |
| tree | 2488a3ed0b72e46a9672c3f57abed0e32df748ba /tools/aapt | |
| parent | df0e9b1b31f62332f0ba3460acd3539fef601d18 (diff) | |
| parent | f781b4ef4bd840b7cee83fafdf2e31e709068bd3 (diff) | |
| download | frameworks_base-f252b3501e6a9893ba3cc7608dbdeab68d8aecb9.zip frameworks_base-f252b3501e6a9893ba3cc7608dbdeab68d8aecb9.tar.gz frameworks_base-f252b3501e6a9893ba3cc7608dbdeab68d8aecb9.tar.bz2 | |
am f781b4ef: am e37ab632: Merge "Fix build on some linux machines"
Merge commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3'
* commit 'f781b4ef4bd840b7cee83fafdf2e31e709068bd3':
Fix build on some linux machines
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index b339a2c..094b7db 100644 --- 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), |