diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 09:55:36 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-08-11 09:55:36 -0700 |
| commit | e37ab63221af94d69437741a3645fc0e14a680bc (patch) | |
| tree | 95b6c0da14880786952dbb82dba0ff575b38c139 | |
| parent | c4c4c98c5ca6b4c017a5b429a6bd80a440c63559 (diff) | |
| parent | b7ffaf6ae29f300c2d8e9c77e58710adfa388633 (diff) | |
| download | frameworks_base-e37ab63221af94d69437741a3645fc0e14a680bc.zip frameworks_base-e37ab63221af94d69437741a3645fc0e14a680bc.tar.gz frameworks_base-e37ab63221af94d69437741a3645fc0e14a680bc.tar.bz2 | |
Merge "Fix build on some linux machines"
| -rw-r--r-- | tools/aapt/Android.mk | 2 | ||||
| -rw-r--r-- | tools/localize/Android.mk | 2 |
2 files changed, 2 insertions, 2 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), diff --git a/tools/localize/Android.mk b/tools/localize/Android.mk index ab79f8d..f284e86 100644 --- 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 |