Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f956650 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Cleanup NATIVE_COVERAGE, PRIVATE_ARFLAGS 

Disable the NATIVE_COVERAGE code when not in use. Provide the proper
PRIVATE_ variables so that the $DISPLAY environment variable isn't
encoded into the ninja file.

Remove PRIVATE_ARFLAGS, which is never set.

Test: compare build-aosp_flounder.ninja
Test: NATIVE_COVERAGE=true build-aosp_flounder.ninja, inspect
Change-Id: I2a52de440fd991cdc5761ff8bd58a474892d2dfc
parent 461a15d0

core/definitions.mk

+7 −9
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@ $(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs; 
        filelist="$$filelist $$ldir/$$ext$$f"; \

    done ; \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \

        $(PRIVATE_ARFLAGS) $@ $$filelist

        $@ $$filelist



endef
@@ -1609,7 +1609,7 @@ define transform-o-to-static-lib 
$(extract-and-include-target-whole-static-libs)

$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \

    $(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))

    $@,$(PRIVATE_ALL_OBJECTS))

endef



# $(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; \

        filelist="$$filelist $$ldir/$$ext$$f"; \

    done ; \

    $(PRIVATE_AR) $(AUX_GLOBAL_ARFLAGS) \

        $(PRIVATE_ARFLAGS) $@ $$filelist

    $(PRIVATE_AR) $(AUX_GLOBAL_ARFLAGS) $@ $$filelist



endef
@@ -1652,8 +1651,7 @@ define transform-o-to-aux-static-lib 
@rm -f $@

$(extract-and-include-aux-whole-static-libs)

$(call split-long-arguments,$(PRIVATE_AR) \

    $(AUX_GLOBAL_ARFLAGS) \

    $(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))

    $(AUX_GLOBAL_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS))

endef



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"; \

    done ; \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) \

        $(PRIVATE_ARFLAGS) $@ $$filelist

        $@ $$filelist



endef
@@ -1757,8 +1755,8 @@ define transform-host-o-to-static-lib 
$(extract-and-include-host-whole-static-libs)

$(create-dummy.o-if-no-objs)

$(call split-long-arguments,$($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)AR) \

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) \

    $(PRIVATE_ARFLAGS) $@,$(PRIVATE_ALL_OBJECTS) $(get-dummy.o-if-no-objs))

    $($(PRIVATE_2ND_ARCH_VAR_PREFIX)$(PRIVATE_PREFIX)GLOBAL_ARFLAGS) $@,\

    $(PRIVATE_ALL_OBJECTS) $(get-dummy.o-if-no-objs))

$(delete-dummy.o-if-no-objs)

endef

core/prebuilt_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -172,15 +172,19 @@ endif 
# "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk.

endif  # my_strip_module not true



ifeq ($(NATIVE_COVERAGE),true)

# Coverage information is needed when static lib is a dependency of another

# coverage-enabled module.

ifeq (STATIC_LIBRARIES, $(LOCAL_MODULE_CLASS))

GCNO_ARCHIVE := $(LOCAL_MODULE).gcnodir

$(intermediates)/$(GCNO_ARCHIVE) : PRIVATE_ALL_OBJECTS :=

$(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) :

	$(transform-o-to-static-lib)

endif

endif



ifeq ($(LOCAL_MODULE_CLASS),APPS)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

core/static_library_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ $(LOCAL_BUILT_MODULE) : $(built_whole_libraries) 
$(LOCAL_BUILT_MODULE) : $(all_objects)

	$(transform-o-to-static-lib)



ifeq ($(NATIVE_COVERAGE),true)

gcno_suffix := .gcnodir



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_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)

	$(transform-o-to-static-lib)

endif