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

Commit dfbe79b8 authored by Ying Wang's avatar Ying Wang
Browse files

Don't expose the compiler dependency. 

Change-Id: Ia472eaab3e8e883a32e8b441a2480562db278e45
parent b71e2df3

core/binary.mk

+33 −32
Original line number Diff line number Diff line
@@ -123,11 +123,12 @@ LOCAL_REQUIRED_MODULES += $(installed_shared_library_module_names) 
#######################################

include $(BUILD_SYSTEM)/base_rules.mk

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

my_compiler_dependencies :=

ifeq ($(strip $(LOCAL_CLANG)),true)

  LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS)

  LOCAL_LDFLAGS += $(CLANG_CONFIG_EXTRA_LDFLAGS)

  LOCAL_C_INCLUDES += $(CLANG_CONFIG_EXTRA_C_INCLUDES)

  LOCAL_COMPILER_DEPENDENCIES := $(CLANG) $(CLANG_CXX)

  my_compiler_dependencies := $(CLANG) $(CLANG_CXX)

endif



####################################################
@@ -363,7 +364,7 @@ cpp_objects := $(cpp_arm_objects) $(cpp_normal_objects) 
ifneq ($(strip $(cpp_objects)),)

$(cpp_objects): $(intermediates)/%.o: \

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

		$(yacc_cpps) $(proto_generated_headers) $(LOCAL_COMPILER_DEPENDENCIES) \

    $(yacc_cpps) $(proto_generated_headers) $(my_compiler_dependencies) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

-include $(cpp_objects:%.o=%.P)
@@ -383,7 +384,7 @@ $(gen_cpp_objects): PRIVATE_ARM_MODE := $(normal_objects_mode) 
$(gen_cpp_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)

$(gen_cpp_objects): $(intermediates)/%.o: \

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

    $(proto_generated_headers)  $(LOCAL_COMPILER_DEPENDENCIES) \

    $(proto_generated_headers)  $(my_compiler_dependencies) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

-include $(gen_cpp_objects:%.o=%.P)
@@ -398,7 +399,7 @@ gen_S_objects := $(gen_S_sources:%.S=%.o) 


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

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

    $(LOCAL_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -408,7 +409,7 @@ gen_s_objects := $(gen_s_sources:%.s=%.o) 


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

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

     $(LOCAL_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -434,7 +435,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_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -452,7 +453,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_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -466,7 +467,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_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -480,7 +481,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_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif
@@ -490,7 +491,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_COMPILER_DEPENDENCIES) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_compiler_dependencies) $(LOCAL_ADDITIONAL_DEPENDENCIES)

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

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

endif

core/clear_vars.mk

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ LOCAL_MODULE_OWNER:= 
LOCAL_CTS_TEST_PACKAGE:=

LOCAL_CTS_TEST_RUNNER:=

LOCAL_CLANG:=

LOCAL_COMPILER_DEPENDENCIES:=



# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to

# iterate over thousands of entries every time.