Change the host build to include whole static libraries, and to name
them "*-host".
Change-Id: Ibf565c9c4b0709eb25edd71786b269895a1616a4
diff --git a/Android.mk b/Android.mk
index f030fea..552f139 100644
--- a/Android.mk
+++ b/Android.mk
@@ -77,13 +77,13 @@
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
