From 25a18110871487ecb861aa8fd37cb20067b5a5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Wed, 9 Aug 2023 19:56:51 +0200 Subject: [PATCH] libselinux: fix logic for building android backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: James Carter --- libselinux/src/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile b/src/Makefile index 20d79312..cf830046 100644 --- a/src/Makefile +++ b/src/Makefile @@ -125,11 +125,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.27.0