diff --git a/core/cc_prebuilt_internal.mk b/core/cc_prebuilt_internal.mk index a8930d5998..6313019eb5 100644 --- a/core/cc_prebuilt_internal.mk +++ b/core/cc_prebuilt_internal.mk @@ -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 diff --git a/core/misc_prebuilt_internal.mk b/core/misc_prebuilt_internal.mk index cc2683c5a7..a52b9e58e4 100644 --- a/core/misc_prebuilt_internal.mk +++ b/core/misc_prebuilt_internal.mk @@ -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) \ No newline at end of file +built_module := $(LOCAL_BUILT_MODULE)