am 39b58ba2: resolved conflicts for merge of bc2fb7b9 to jb-dev-plus-aosp

[android/aapt.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index a3e5d9a503b456d39e89275e3f35dcdbd6af376d..d0a81dc1b1a8e5965d9f511a62ca617a1ccbe7ef 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -38,13 +38,14 @@ LOCAL_C_INCLUDES += build/libs/host/include
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \
+       libandroidfw \
        libutils \
        libcutils \
        libexpat \
        libpng
 
 ifeq ($(HOST_OS),linux)
-LOCAL_LDLIBS += -lrt -lpthread
+LOCAL_LDLIBS += -lrt -ldl -lpthread
 endif
 
 # Statically link libz for MinGW (Win SDK under Linux),