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

Commit ab2bf9f1 authored by Aaron Kling's avatar Aaron Kling
Browse files

fixup! Reland: Verify init scripts for correctness during build 

The dir macro returns the path with a trailing slash. The copy-files
and prebuilt filter checks for files in the etc/init directory did not
have a trailing slash in the comparison string.

Change-Id: If56e283ac33784514d4b715bb25d48c044c904cc
parent e56edd1c

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ $(foreach cf,$(unique_product_copy_files_pairs), \ 
            $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\

            $(if $(and $(filter %.jar,$(_dest)),$(filter $(basename $(notdir $(_dest))),$(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))),\

                $(eval $(call copy-and-uncompress-dexs,$(_src),$(_fulldest))), \

                $(if $(filter init%rc,$(notdir $(_dest)))$(filter %/etc/init,$(dir $(_dest))),\

                $(if $(filter init%rc,$(notdir $(_dest)))$(filter %/etc/init/,$(dir $(_dest))),\

                    $(eval $(call copy-init-script-file-checked,$(_src),$(_fulldest))),\

                    $(if $(and $(filter true,$(check_elf_prebuilt_product_copy_files)), \

                               $(filter bin lib lib64,$(subst /,$(space),$(_dest)))), \

core/misc_prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 


include $(BUILD_SYSTEM)/base_rules.mk



ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init,$(dir $(LOCAL_INSTALLED_MODULE))),)

ifneq ($(filter init%rc,$(notdir $(LOCAL_INSTALLED_MODULE)))$(filter %/etc/init/,$(dir $(LOCAL_INSTALLED_MODULE))),)

  $(eval $(call copy-init-script-file-checked,$(my_prebuilt_src_file),$(LOCAL_BUILT_MODULE)))

else

$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)