p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208a3 am: c14071eb7d am: 66990f95b3 am: 92378961f0 

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

Change-Id: I92a2e5502f6eb15c60329ac008a7da7bc37577c4
This commit is contained in:
Martin Stjernholm 2020-09-28 15:07:03 +00:00 committed by Automerger Merge Worker
parent 71b87cbaca 92378961f0
commit 5b167cc9a7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/soong_cc_prebuilt.mk
View File

@ -150,11 +150,14 @@ endif
$(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)
endif
else
$(transform-prebuilt-to-target)
endif
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
$(hide) chmod +x $@
endif
endif
ifndef LOCAL_IS_HOST_MODULE

7
core/soong_rust_prebuilt.mk
View File

@ -59,11 +59,14 @@ endif
$(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)
endif
else
$(transform-prebuilt-to-target)
endif
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
ifneq ($(filter EXECUTABLES NATIVE_TESTS,$(LOCAL_MODULE_CLASS)),)
$(hide) chmod +x $@
endif
endif
ifndef LOCAL_IS_HOST_MODULE