openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

Amends https://r.android.com/1439191; I realised echo-error doesn't
imply a false status.

Test: m art-check-{release,debug,testing}-apex-gen-fakebin
  without https://r.android.com/1441933.
Bug: 169375644
Change-Id: Ice75aeab30120e781df50a28c3dce3874ec0bfd1
This commit is contained in:
Martin Stjernholm 2020-09-30 15:07:41 +01:00
parent 70b4738324
commit bf4e8f4708
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/soong_cc_prebuilt.mk
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)

2
core/soong_rust_prebuilt.mk
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)