diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-06 18:46:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-06 18:46:02 +0000 |
| commit | 15cb27748f5a95fa74ba15e4f48721a6ce134600 (patch) | |
| tree | b9dabd52ff4667ea85e5f2e918c3bcea41cf3c0d /core/binary.mk | |
| parent | 7052c570fde48bbe92c4527e5ce22331ccf5badd (diff) | |
| parent | 55c2adfffac9b40992316938699cb36e0818fbbb (diff) | |
| download | build-15cb27748f5a95fa74ba15e4f48721a6ce134600.zip build-15cb27748f5a95fa74ba15e4f48721a6ce134600.tar.gz build-15cb27748f5a95fa74ba15e4f48721a6ce134600.tar.bz2 | |
am 55c2adff: am b6361968: Merge "Remove unused my_compiler_dependencies."
* commit '55c2adfffac9b40992316938699cb36e0818fbbb':
Remove unused my_compiler_dependencies.
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/core/binary.mk b/core/binary.mk index 370cbed..0ad95ad 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -256,8 +256,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 #################################################### @@ -711,8 +709,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 @@ -732,8 +729,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 @@ -747,8 +743,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 @@ -758,8 +753,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 @@ -791,8 +785,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 @@ -810,8 +803,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 @@ -825,8 +817,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 @@ -840,8 +831,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 @@ -851,8 +841,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 |