Merge "Make the build fail when the executable prebuilt target check fails."

This commit is contained in:
Martin Stjernholm 2020-10-12 09:24:38 +00:00 committed by Gerrit Code Review
commit dee171a859
2 changed files with 2 additions and 2 deletions

View file

@ -151,7 +151,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)
ifeq ($(LOCAL_IS_HOST_MODULE) $(if $(filter EXECUTABLES SHARED_LIBRARIES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),true,),true true)
$(copy-or-link-prebuilt-to-target)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
[ -x $@ ] || $(call echo-error,$@,Target of symlink is not executable)
[ -x $@ ] || ( $(call echo-error,$@,Target of symlink is not executable); false )
endif
else
$(transform-prebuilt-to-target)

View file

@ -60,7 +60,7 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PREBUILT_MODULE_FILE)
ifeq ($(LOCAL_IS_HOST_MODULE) $(if $(filter EXECUTABLES SHARED_LIBRARIES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),true,),true true)
$(copy-or-link-prebuilt-to-target)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
[ -x $@ ] || $(call echo-error,$@,Target of symlink is not executable)
[ -x $@ ] || ( $(call echo-error,$@,Target of symlink is not executable); false )
endif
else
$(transform-prebuilt-to-target)