Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build: Enable Android backend, disable X backend.
[libselinux] Enable Android property label backend. JB#46428 [libselinux] Disable X label backend.
- Loading branch information
Showing
3 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile | ||
index 977b5c8c..8b8eedb8 100644 | ||
--- a/libselinux/src/Makefile | ||
+++ b/libselinux/src/Makefile | ||
@@ -128,6 +128,10 @@ SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) | ||
|
||
SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) | ||
|
||
+# Don't build X backend | ||
+DISABLE_FLAGS+= -DNO_X_BACKEND | ||
+SRCS:= $(filter-out label_x.c, $(SRCS)) | ||
+ | ||
all: $(LIBA) $(LIBSO) $(LIBPC) | ||
|
||
pywrap: all $(SWIGFILES) $(AUDIT2WHYSO) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile | ||
index 977b5c8c..d5c2e7c1 100644 | ||
--- a/libselinux/src/Makefile | ||
+++ b/libselinux/src/Makefile | ||
@@ -113,17 +113,6 @@ ifneq (,$(filter i386,$(ARCH))) | ||
TLSFLAGS += -mno-tls-direct-seg-refs | ||
endif | ||
|
||
-ifeq ($(ANDROID_HOST),y) | ||
-DISABLE_FLAGS+= -DNO_MEDIA_BACKEND -DNO_DB_BACKEND -DNO_X_BACKEND \ | ||
- -DBUILD_HOST | ||
-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 | ||
-DISABLE_FLAGS+= -DNO_ANDROID_BACKEND | ||
-SRCS:= $(filter-out label_backends_android.c, $(SRCS)) | ||
-endif | ||
- | ||
SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ $(DISABLE_FLAGS) | ||
|
||
SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters