StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS" am: fce41130cc

Browse Source 
am: 79feb28724

Change-Id: I2a6d3ae69e67bf3f7849b11695b33165315f9aab
This commit is contained in:
Dan Willemsen
2016-10-22 03:09:03 +00:00
committed by android-build-merger
parent 4db457e030 79feb28724
commit 083a6303c0
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/definitions.mk
View File

@@ -1584,7 +1584,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;
filelist="$$filelist $$ldir/$$ext$$f"; \ filelist="$$filelist $$ldir/$$ext$$f"; \
done ; \ done ; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
$(PRIVATE_ARFLAGS) $@ $$filelist $@ $$filelist
endef endef
@@ -1609,7 +1609,7 @@ define transform-o-to-static-lib
$(extract-and-include-target-whole-static-libs) $(extract-and-include-target-whole-static-libs)
$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \ $(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
$(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS)) $@,$(PRIVATE_ALL_OBJECTS))
endef endef
# $(1): the full path of the source static library. # $(1): the full path of the source static library.
@@ -1633,8 +1633,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;
$(PRIVATE_AR) p $$lib_to_include $$f > $$ldir/$$ext$$f; \ $(PRIVATE_AR) p $$lib_to_include $$f > $$ldir/$$ext$$f; \
filelist="$$filelist $$ldir/$$ext$$f"; \ filelist="$$filelist $$ldir/$$ext$$f"; \
done ; \ done ; \
$(PRIVATE_AR) $(AUX_GLOBAL_ARFLAGS) \ $(PRIVATE_AR) $(AUX_GLOBAL_ARFLAGS) $@ $$filelist
$(PRIVATE_ARFLAGS) $@ $$filelist
endef endef
@@ -1652,8 +1651,7 @@ define transform-o-to-aux-static-lib
@rm -f $@ @rm -f $@
$(extract-and-include-aux-whole-static-libs) $(extract-and-include-aux-whole-static-libs)
$(call split-long-arguments,$(PRIVATE_AR) \ $(call split-long-arguments,$(PRIVATE_AR) \
$(AUX_GLOBAL_ARFLAGS) \ $(AUX_GLOBAL_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))
$(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))
endef endef
define transform-o-to-aux-executable-inner define transform-o-to-aux-executable-inner
@@ -1721,7 +1719,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;
filelist="$$filelist $$ldir/$$ext$$f"; \ filelist="$$filelist $$ldir/$$ext$$f"; \
done ; \ done ; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) \
$(PRIVATE_ARFLAGS) $@ $$filelist $@ $$filelist
endef endef
@@ -1757,8 +1755,8 @@ define transform-host-o-to-static-lib
$(extract-and-include-host-whole-static-libs) $(extract-and-include-host-whole-static-libs)
$(create-dummy.o-if-no-objs) $(create-dummy.o-if-no-objs)
$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) \ $(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) $@,\
$(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS) $(get-dummy.o-if-no-objs)) $(PRIVATE_ALL_OBJECTS) $(get-dummy.o-if-no-objs))
$(delete-dummy.o-if-no-objs) $(delete-dummy.o-if-no-objs)
endef endef

4
core/prebuilt_internal.mk
View File

@@ -174,15 +174,19 @@ endif
# "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk. # "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk.
endif # my_strip_module not true endif # my_strip_module not true
ifeq ($(NATIVE_COVERAGE),true)
# Coverage information is needed when static lib is a dependency of another # Coverage information is needed when static lib is a dependency of another
# coverage-enabled module. # coverage-enabled module.
ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS)) ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS))
GCNO_ARCHIVE := $(LOCAL_MODULE).gcnodir GCNO_ARCHIVE := $(LOCAL_MODULE).gcnodir
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS :=
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES :=
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_PREFIX := $(my_prefix)
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)
$(intermediates)/$(GCNO_ARCHIVE) : $(intermediates)/$(GCNO_ARCHIVE) :
$(transform-o-to-static-lib) $(transform-o-to-static-lib)
endif endif
endif
ifeq ($(LOCAL_MODULE_CLASS),APPS) ifeq ($(LOCAL_MODULE_CLASS),APPS)
PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

4
core/static_library_internal.mk
View File

@@ -24,6 +24,7 @@ $(LOCAL_BUILT_MODULE) : $(built_whole_libraries)
$(LOCAL_BUILT_MODULE) : $(all_objects) $(LOCAL_BUILT_MODULE) : $(all_objects)
$(transform-o-to-static-lib) $(transform-o-to-static-lib)
ifeq ($(NATIVE_COVERAGE),true)
gcno_suffix := .gcnodir gcno_suffix := .gcnodir
built_whole_gcno_libraries := \ built_whole_gcno_libraries := \
@@ -36,5 +37,8 @@ GCNO_ARCHIVE := $(LOCAL_MODULE)$(gcno_suffix)
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES)) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS := $(strip $(LOCAL_GCNO_FILES))
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries)) $(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_WHOLE_STATIC_LIBRARIES := $(strip $(built_whole_gcno_libraries))
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_PREFIX := $(my_prefix)
$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_2ND_ARCH_VAR_PREFIX := $(LOCAL_2ND_ARCH_VAR_PREFIX)
$(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries) $(intermediates)/$(GCNO_ARCHIVE) : $(LOCAL_GCNO_FILES) $(built_whole_gcno_libraries)
$(transform-o-to-static-lib) $(transform-o-to-static-lib)
endif