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
diff --git a/core/host_static_library.mk b/core/host_static_library.mk
index 237981f..39c99ee 100644
--- a/core/host_static_library.mk
+++ b/core/host_static_library.mk
@@ -1,5 +1,5 @@
###########################################################
-## Standard rules for building a static library.
+## Standard rules for building a static library for the host.
##
## Additional inputs from base_rules.make:
## None.
@@ -7,8 +7,6 @@
## LOCAL_MODULE_SUFFIX will be set for you.
###########################################################
-LOCAL_IS_HOST_MODULE := true
-
ifeq ($(strip $(LOCAL_MODULE_CLASS)),)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
endif
@@ -17,7 +15,10 @@
endif
LOCAL_UNINSTALLABLE_MODULE := true
+LOCAL_IS_HOST_MODULE := true
+
include $(BUILD_SYSTEM)/binary.mk
+$(LOCAL_BUILT_MODULE): $(built_whole_libraries)
$(LOCAL_BUILT_MODULE): $(all_objects)
$(transform-host-o-to-static-lib)