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

Commit 954b5bdc authored by Dan Albert's avatar Dan Albert
Browse files

Make modules depend on their makefile. 

This should obviate much of the need for cleanspecs, and also make it
unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this
sort of thing all over the tree.

Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
parent 1f637158

core/base_rules.mk

+6 −1
Original line number Diff line number Diff line
@@ -218,7 +218,12 @@ LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS) 
endif # LOCAL_SDK_VERSION

$(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_import)) -I$(LOCAL_PATH) -I$(LOCAL_PATH)/src $(addprefix -I,$(LOCAL_AIDL_INCLUDES))



$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: $(TOPDIR)$(LOCAL_PATH)/%.aidl $(LOCAL_ADDITIONAL_DEPENDENCIES) $(AIDL) $(aidl_preprocess_import)

$(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \

        $(TOPDIR)$(LOCAL_PATH)/%.aidl \

        $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES) \

        $(AIDL) \

        $(aidl_preprocess_import)

	$(transform-aidl-to-java)

-include $(aidl_java_sources:%.java=%.P)

core/binary.mk

+14 −13
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ my_cxx := $(LOCAL_CXX) 
my_c_includes := $(LOCAL_C_INCLUDES)

my_generated_sources := $(LOCAL_GENERATED_SOURCES)

my_native_coverage := $(LOCAL_NATIVE_COVERAGE)

my_additional_dependencies := $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES)



# MinGW spits out warnings about -fPIC even for -fpie?!) being ignored because

# all code is position independent, and then those warnings get promoted to
@@ -601,7 +602,7 @@ yacc_objects := $(yacc_cpps:$(LOCAL_CPP_EXTENSION)=.o) 
ifneq ($(strip $(y_yacc_cpps)),)

$(y_yacc_cpps): $(intermediates)/%$(LOCAL_CPP_EXTENSION): \

    $(TOPDIR)$(LOCAL_PATH)/%.y \

    $(lex_cpps) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(lex_cpps) $(my_additional_dependencies)

	$(call transform-y-to-cpp,$(PRIVATE_CPP_EXTENSION))

$(yacc_headers): $(intermediates)/%.h: $(intermediates)/%$(LOCAL_CPP_EXTENSION)

endif
@@ -609,7 +610,7 @@ endif 
ifneq ($(strip $(yy_yacc_cpps)),)

$(yy_yacc_cpps): $(intermediates)/%$(LOCAL_CPP_EXTENSION): \

    $(TOPDIR)$(LOCAL_PATH)/%.yy \

    $(lex_cpps) $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(lex_cpps) $(my_additional_dependencies)

	$(call transform-y-to-cpp,$(PRIVATE_CPP_EXTENSION))

$(yacc_headers): $(intermediates)/%.h: $(intermediates)/%$(LOCAL_CPP_EXTENSION)

endif
@@ -653,7 +654,7 @@ $(lex_objects): PRIVATE_ARM_MODE := $(normal_objects_mode) 
$(lex_objects): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)

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

    $(intermediates)/%$(LOCAL_CPP_EXTENSION) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES) \

    $(my_additional_dependencies) \

    $(yacc_headers)

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

endif
@@ -681,7 +682,7 @@ ifneq ($(strip $(cpp_objects)),) 
$(cpp_objects): $(intermediates)/%.o: \

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

    $(yacc_cpps) $(proto_generated_headers) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_additional_dependencies)

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

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

endif
@@ -701,7 +702,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_additional_dependencies)

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

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

endif
@@ -715,7 +716,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_additional_dependencies)

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

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

endif
@@ -725,7 +726,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_additional_dependencies)

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

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

endif
@@ -757,7 +758,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_additional_dependencies)

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

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

endif
@@ -775,7 +776,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_additional_dependencies)

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

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

endif
@@ -789,7 +790,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_additional_dependencies)

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

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

endif
@@ -803,7 +804,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_additional_dependencies)

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

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

endif
@@ -813,7 +814,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_additional_dependencies)

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

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

endif
@@ -827,7 +828,7 @@ asm_sources_asm := $(filter %.asm,$(my_src_files)) 
ifneq ($(strip $(asm_sources_asm)),)

asm_objects_asm := $(addprefix $(intermediates)/,$(asm_sources_asm:.asm=.o))

$(asm_objects_asm): $(intermediates)/%.o: $(TOPDIR)$(LOCAL_PATH)/%.asm \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(my_additional_dependencies)

	$(transform-asm-to-o)



asm_objects += $(asm_objects_asm)

core/droiddoc.mk

+8 −1
Original line number Diff line number Diff line
@@ -154,7 +154,14 @@ endif 
# TODO: not clear if this is used any more

$(full_target): PRIVATE_LOCAL_PATH := $(LOCAL_PATH)



$(full_target): $(full_src_files) $(droiddoc_templates) $(droiddoc) $(html_dir_files) $(full_java_lib_deps) $(LOCAL_ADDITIONAL_DEPENDENCIES)

$(full_target): \

        $(full_src_files) \

        $(droiddoc_templates) \

        $(droiddoc) \

        $(html_dir_files) \

        $(full_java_lib_deps) \

        $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	@echo Docs droiddoc: $(PRIVATE_OUT_DIR)

	$(hide) mkdir -p $(dir $@)

	$(call prepare-doc-source-list,$(PRIVATE_SRC_LIST_FILE),$(PRIVATE_JAVA_FILES), \

core/host_dalvik_java_library.mk

+8 −2
Original line number Diff line number Diff line
@@ -69,8 +69,14 @@ $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := 
$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_RMTYPEDEFS :=

$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)

$(full_classes_compiled_jar): \

        $(java_sources) \

        $(java_resource_sources) \

        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)



# Run jarjar if necessary, otherwise just copy the file.

core/host_java_library.mk

+8 −2
Original line number Diff line number Diff line
@@ -79,6 +79,12 @@ $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := 
$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_RMTYPEDEFS :=

$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \

		$(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)

$(full_classes_compiled_jar): \

        $(java_sources) \

        $(java_resource_sources) \

        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)