diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-02-26 20:45:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-26 20:47:05 +0000 |
| commit | 330bd58db11d1dbbca77088fd572cbe3c3dca288 (patch) | |
| tree | 6c22aace022a9d9d5661efc8e872f1443846a5a0 | |
| parent | 3ac65f86d78ab61b6cfbf8eff763b0aae20e0c63 (diff) | |
| parent | 01f1fc27ba13275f9a638b811f641a405f8d121c (diff) | |
| download | base-froyo.tar.gz | |
Merge "Add missing libraries, to be able to link on 12.04" into froyofroyo
| -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 b339a2cd2eb0..86977b213d15 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 -ldl -lpthread endif # Statically link libz for MinGW (Win SDK under Linux), diff --git a/tools/localize/Android.mk b/tools/localize/Android.mk index ab79f8dbdcfc..5ec9febe0fa2 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 -ldl -lpthread endif |