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

Commit 6215e436 authored by Tom Cherry's avatar Tom Cherry
Browse files

Fix host-init-verifier regression 

After the split up of prebuilt_internal.mk, the logic for running
host-init-verifier on init.rc files was misplaced.  This change moves
it back to the right location.

Test: see that a mistake in rootdir/init.rc causes the build to fail
Change-Id: I60e503cc48639f4f11c47e6636f140672fde61b4
parent 39369d08

core/cc_prebuilt_internal.mk

+0 −7
Original line number Diff line number Diff line
@@ -180,15 +180,8 @@ endif 
endif

endif



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),$(built_module)))

else ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

$(built_module) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target-strip-comments)

else

$(built_module) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target)

endif

ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)

	$(hide) chmod +x $@

endif

core/misc_prebuilt_internal.mk

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


include $(BUILD_SYSTEM)/base_rules.mk



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 ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target-strip-comments)

else

$(LOCAL_BUILT_MODULE) : $(my_prebuilt_src_file)

	$(transform-prebuilt-to-target)

endif



built_module := $(LOCAL_BUILT_MODULE)