Make the host static library build rule know about
LOCAL_WHOLE_STATIC_LIBRARIES.
While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.
Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
diff --git a/core/definitions.mk b/core/definitions.mk
index 06b6201..46c64d1 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -942,8 +942,9 @@
# try to add to an existing archive.
define transform-host-o-to-static-lib
@mkdir -p $(dir $@)
-@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
@rm -f $@
+$(extract-and-include-whole-static-libs)
+@echo "host StaticLib: $(PRIVATE_MODULE) ($@)"
echo $^ | xargs $(HOST_AR) $(HOST_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@
endef