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

Commit a8fd6682 authored by Dan Albert's avatar Dan Albert
Browse files

Remove unused my_compiler_dependencies. 

my_compiler_dependencies was never assigned to, but the way it was
included in the rules prevented the user from being able to use | in
LOCAL_ADDITIONAL_DEPENDENCIES. Since it is unneeded, just remove it.

Change-Id: I74bb59e81b97756296060eea5b7a42909be50130
parent 9979ae43

core/binary.mk

+9 −20
Original line number Diff line number Diff line
@@ -254,8 +254,6 @@ ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT)) 
  my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)

endif



my_compiler_dependencies :=



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

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

####################################################
@@ -704,8 +702,7 @@ ifneq ($(strip $(cpp_objects)),) 
$(cpp_objects): $(intermediates)/%.o: \

    $(TOPDIR)$(LOCAL_PATH)/%$(LOCAL_CPP_EXTENSION) \

    $(yacc_cpps) $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

-include $(cpp_objects:%.o=%.P)

endif
@@ -725,8 +722,7 @@ $(gen_cpp_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) 
$(gen_cpp_objects): $(intermediates)/%.o: \

    $(intermediates)/%$(LOCAL_CPP_EXTENSION) $(yacc_cpps) \

    $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)cpp-to-o)

-include $(gen_cpp_objects:%.o=%.P)

endif
@@ -740,8 +736,7 @@ gen_S_objects := $(gen_S_sources:%.S=%.o) 


ifneq ($(strip $(gen_S_sources)),)

$(gen_S_objects): $(intermediates)/%.o: $(intermediates)/%.S \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)s-to-o)

-include $(gen_S_objects:%.o=%.P)

endif
@@ -751,8 +746,7 @@ gen_s_objects := $(gen_s_sources:%.s=%.o) 


ifneq ($(strip $(gen_s_objects)),)

$(gen_s_objects): $(intermediates)/%.o: $(intermediates)/%.s \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)s-to-o-no-deps)

-include $(gen_s_objects:%.o=%.P)

endif
@@ -784,8 +778,7 @@ c_objects := $(c_arm_objects) $(c_normal_objects) 


ifneq ($(strip $(c_objects)),)

$(c_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.c $(yacc_cpps) $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)c-to-o)

-include $(c_objects:%.o=%.P)

endif
@@ -803,8 +796,7 @@ ifneq ($(strip $(gen_c_objects)),) 
$(gen_c_objects): PRIVATE_ARM_MODE := $(normal_objects_mode)

$(gen_c_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)

$(gen_c_objects): $(intermediates)/%.o: $(intermediates)/%.c $(yacc_cpps) $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)c-to-o)

-include $(gen_c_objects:%.o=%.P)

endif
@@ -818,8 +810,7 @@ objc_objects := $(addprefix $(intermediates)/,$(objc_sources:.m=.o)) 


ifneq ($(strip $(objc_objects)),)

$(objc_objects): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.m $(yacc_cpps) $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)m-to-o)

-include $(objc_objects:%.o=%.P)

endif
@@ -833,8 +824,7 @@ asm_objects_S := $(addprefix $(intermediates)/,$(asm_sources_S:.S=.o)) 


ifneq ($(strip $(asm_objects_S)),)

$(asm_objects_S): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.S \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)s-to-o)

-include $(asm_objects_S:%.o=%.P)

endif
@@ -844,8 +834,7 @@ asm_objects_s := $(addprefix $(intermediates)/,$(asm_sources_s:.s=.o)) 


ifneq ($(strip $(asm_objects_s)),)

$(asm_objects_s): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.s \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    | $(my_compiler_dependencies)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-$(PRIVATE_HOST)s-to-o-no-deps)

-include $(asm_objects_s:%.o=%.P)

endif