Change the host build to include whole static libraries, and to name

[android-x86/dalvik.git] / libnativehelper / Android.mk

diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk
index f030fea..552f139 100644 (file)
--- a/libnativehelper/Android.mk
+++ b/libnativehelper/Android.mk
@@ -77,13 +77,13 @@ ifeq ($(WITH_HOST_DALVIK),true)
 
     LOCAL_SRC_FILES := $(src_files)
     LOCAL_C_INCLUDES := $(c_includes)
-    LOCAL_STATIC_LIBRARIES := $(static_libraries)
+    LOCAL_WHOLE_STATIC_LIBRARIES := $(static_libraries:%=%-host)
 
     ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86)
         # OSX has a lot of libraries built in, which we don't have to
         # bother building; just include them on the ld line.
         LOCAL_LDLIBS := -lexpat -lssl -lz -lcrypto -licucore -lsqlite3
-       LOCAL_STATIC_LIBRARIES += libutils
+       LOCAL_WHOLE_STATIC_LIBRARIES += libutils
     else
         LOCAL_SHARED_LIBRARIES := $(shared_libraries)
     endif