openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Dan Bornstein 2009-10-15 13:01:36 -07:00
parent 3ca0693894
commit 6bffc91c5d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/definitions.mk
View File

@ -942,8 +942,9 @@ endef
# 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

7
core/host_static_library.mk
View File

@ -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 @@ LOCAL_MODULE_SUFFIX := .a
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)