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

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

Merge "Do not chmod the symlink target when a prebuilt binary is symlinked." am: 0de50208 

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

Change-Id: Icb4dddce2d980bce09353b8fb98758f07e297c81
parents 8e1fcee3 0de50208

core/soong_cc_prebuilt.mk

+5 −2
Original line number Diff line number Diff line
@@ -150,12 +150,15 @@ 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)),)

	$(hide) chmod +x $@

  endif

endif



ifndef LOCAL_IS_HOST_MODULE

  ifdef LOCAL_SOONG_UNSTRIPPED_BINARY

core/soong_rust_prebuilt.mk

+5 −2
Original line number Diff line number Diff line
@@ -59,12 +59,15 @@ 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)),)

	$(hide) chmod +x $@

  endif

endif



ifndef LOCAL_IS_HOST_MODULE

  ifdef LOCAL_SOONG_UNSTRIPPED_BINARY