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

Commit dee171a8 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

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

parents 6d34f734 bf4e8f47

core/soong_cc_prebuilt.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

core/soong_rust_prebuilt.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)