[Toybox] imgtec patch: Fix static linkage of toybox binary.

Rob Landley rob at landley.net
Thu May 5 20:15:01 PDT 2016


On 05/05/2016 06:21 PM, enh wrote:
> imgtec sent us https://android-review.googlesource.com/#/c/223060/
> 
> Fix static linkage of toybox binary.
> 
> If toybox was compiled statically e.g. for use in a recovery ramdisk,
> it would not build after b66a29a. This is because libselinux already
> exports a selinux_log_callback() function which getprop.c is trying
> to override.
> 
> This change simply makes the second symbol static, since it is only
> used in a function table so we do not actually need to export it
> from toybox.
> 
> Change-Id: I603258877ae2286660df35738bbf4f4285df5b54
> Signed-off-by: Alistair Strachan <alistair.strachan at imgtec.com>
> 
> 
> 
> the git cherrypick copy & paste (from the top-right in the gerrit UI) is:
> 
> git fetch https://android.googlesource.com/platform/external/toybox
> refs/changes/60/223060/1 && git cherry-pick FETCH_HEAD

I can attest that non-selinux static builds worked fine during this
period. :)

Applied, and that fetch+cherry-pick thing _also_ seems to avoid a
gratuitous merge commit, which is very nice.

Rob


More information about the Toybox mailing list