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

Commit d7e99838 authored Jan 06, 2025 by Treehugger Robot Committed by Automerger Merge Worker Jan 06, 2025

Merge "fixup! Reland: Verify init scripts for correctness during build" into...

Merge "fixup! Reland: Verify init scripts for correctness during build" into main am: 0ab4fa12 am: 1b804226

Original change: https://android-review.googlesource.com/c/platform/build/+/3436140

Change-Id: Ib041bf969e643f4b0f83bf238eee07ec2a61a727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents bd652956 1b804226

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)