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

Commit f0ed2986 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove all unused, legacy FDO build rules"

parents 13ebf1bd d49aa55c

core/binary.mk

+0 −27
Original line number Diff line number Diff line
@@ -471,27 +471,6 @@ ifneq ($(foreach i,$(my_c_includes),$(filter %/..,$(i))$(findstring /../,$(i))), 
my_soong_problems += dotdot_incs

endif



####################################################

## Add FDO flags if FDO is turned on and supported

## Please note that we will do option filtering during FDO build.

## i.e. Os->O2, remove -fno-early-inline and -finline-limit.

##################################################################

my_fdo_build :=

ifneq ($(filter true always, $(LOCAL_FDO_SUPPORT)),)

  ifeq ($(BUILD_FDO_INSTRUMENT),true)

    my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_INSTRUMENT_CFLAGS)

    my_ldflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_INSTRUMENT_LDFLAGS)

    my_fdo_build := true

  else ifneq ($(filter true,$(BUILD_FDO_OPTIMIZE))$(filter always,$(LOCAL_FDO_SUPPORT)),)

    my_cflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_FDO_OPTIMIZE_CFLAGS)

    my_fdo_build := true

  endif

  # Disable ccache (or other compiler wrapper) except gomacc, which

  # can handle -fprofile-use properly.

  my_cc_wrapper := $(filter $(GOMA_CC) $(RBE_WRAPPER),$(my_cc_wrapper))

  my_cxx_wrapper := $(filter $(GOMA_CC) $(RBE_WRAPPER),$(my_cxx_wrapper))

endif



###########################################################

## Explicitly declare assembly-only __ASSEMBLY__ macro for

## assembly source
@@ -1479,12 +1458,6 @@ my_cppflags := $(call convert-to-clang-flags,$(my_cppflags)) 
my_asflags := $(call convert-to-clang-flags,$(my_asflags))

my_ldflags := $(call convert-to-clang-flags,$(my_ldflags))



ifeq ($(my_fdo_build), true)

  my_cflags := $(patsubst -Os,-O2,$(my_cflags))

  fdo_incompatible_flags := -fno-early-inlining -finline-limit=%

  my_cflags := $(filter-out $(fdo_incompatible_flags),$(my_cflags))

endif



# No one should ever use this flag. On GCC it's mere presence will disable all

# warnings, even those that are specified after it (contrary to typical warning

# flag behavior). This circumvents CFLAGS_NO_OVERRIDE from forcibly enabling the

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:= 
LOCAL_EXTRA_FULL_TEST_CONFIGS:=

LOCAL_EXTRACT_APK:=

LOCAL_EXTRACT_DPI_APK:=

LOCAL_FDO_SUPPORT:=

LOCAL_FILE_CONTEXTS:=

LOCAL_FINDBUGS_FLAGS:=

LOCAL_FORCE_STATIC_EXECUTABLE:=

core/combo/TARGET_linux-arm.mk

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),) 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

core/combo/TARGET_linux-arm64.mk

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))

core/combo/TARGET_linux-x86.mk

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ $(error Unknown $(TARGET_$(combo_2nd_arch_prefix)ARCH) architecture version: $(T 
endif



include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

include $(BUILD_SYSTEM)/combo/fdo.mk



define $(combo_var_prefix)transform-shared-lib-to-toc

$(call _gen_toc_command_for_elf,$(1),$(2))