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

Commit 8bf69034 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

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

Merge "Make the build fail when the executable prebuilt target check fails." am: dee171a8 am: 5c3f09cb am: 1be17f15

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

Change-Id: If8ae6d2d2782b0ef4bc13f648bb16729f5328c49
parents 0d142625 1be17f15

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)