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 cb55a9cfd4d688ff9974460b0e4b61927f12964c..d0a81dc1b1a8e5965d9f511a62ca617a1ccbe7ef 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -38,6 +38,7 @@ LOCAL_C_INCLUDES += build/libs/host/include
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \
 #LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
        libhost \

+       libandroidfw \

        libutils \
        libcutils \
        libexpat \
        libutils \
        libcutils \
        libexpat \