On Tue, Oct 10, 2023 at 3:13 PM James Carter <jwcart2@xxxxxxxxx> wrote:
>
> On Mon, Aug 14, 2023 at 9:42 AM Christian Göttsche
> <cgzones@xxxxxxxxxxxxxx> wrote:
> >
> > Fix the typo and adjust the logic accordingly so the android backend is
> > not build by default, but if either ANDROID_HOST or
> > LABEL_BACKEND_ANDROID is set to y.
> >
> > Fixes: c2a58cc52574 ("libselinux: LABEL_BACKEND_ANDROID add option to enable")
> > Signed-off-by: Christian Göttsche <cgzones@xxxxxxxxxxxxxx>
>
> Acked-by: James Carter <jwcart2@xxxxxxxxx>
>
Merged.
Thanks,
Jim
> > ---
> > libselinux/src/Makefile | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
> > index 15d224e1..86a254da 100644
> > --- a/libselinux/src/Makefile
> > +++ b/libselinux/src/Makefile
> > @@ -131,11 +131,10 @@ DISABLE_FLAGS+= -DNO_MEDIA_BACKEND -DNO_DB_BACKEND -DNO_X_BACKEND \
> > SRCS= callbacks.c freecon.c label.c label_file.c \
> > label_backends_android.c regex.c label_support.c \
> > matchpathcon.c setrans_client.c sha1.c booleans.c
> > -else
> > LABEL_BACKEND_ANDROID=y
> > endif
> >
> > -ifneq ($(LABEL_BACKEND_ANDROIDT),y)
> > +ifneq ($(LABEL_BACKEND_ANDROID),y)
> > SRCS:= $(filter-out label_backends_android.c, $(SRCS))
> > DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
> > endif
> > --
> > 2.40.1
> >
